在Git中用beyond compare进行比较

1. 首先需要安装beyond compare, 这个就不细说了。

2. 修改~/.gitconfig文件,如下所示:

[diff]   
    tool = bc3
[difftool "bc3"]   
    cmd = /usr/bin/bcompare \"$LOCAL\" \"$REMOTE\"   
[difftool]   
    prompt = false   
[merge]
    tool = bc3   
[mergetool "bc3"]   
    cmd = /usr/bin/bcompare \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"   
    trustExitCode = true

3. 可以参考下BCompare http://www.scootersoftware.com/support.php?c=kb_vcs.php

你可能感兴趣的:(cmd,git,merge)