1、修改~/.gitconfig文件,增加以下内容
[diff]
tool = bc3
[difftool "bc3"]
cmd = /opt/bin/bcompare \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = bc3
[mergetool "bc3"]
cmd = /opt/bin/bcompare \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
注:/opt/bin/bcompare 为实际安装位置
git difftool 进行比较。
详细请看:http://wenku.baidu.com/view/890929611ed9ad51f01df242.html