git配置比较工具

git配置比较工具

1.修改.gitconfig文件

[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
cmd = "\"C:/Users/xxx/AppData/Local/Beyond Compare 4/BComp.exe\" \"$LOCAL\" \"$REMOTE\""
[merge]
tool = bc
[mergetool]
prompt = false
[mergetool "bc4"]
cmd = "\"C:/Users/xxx/AppData/Local/Beyond Compare 4/BComp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""

2. 下载gitcola

   使用gitcola进行