Windows下GIT配置BeyondCompare为默认差异比较工具和合并工具 

[user]
email = ray0324@foxmail.com
name = ray0324
[gui]
encoding = utf-8
[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
cmd = "\"D:/Program Files/BeyondCompare/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""
[merge]
tool = bc
[mergetool]
prompt = false
keepBackup = false
[mergetool "bc"]
cmd = "\"D:/Program Files/BeyondCompare/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""

这里用的beyondCompare4 其中 keepBackup=false可以防止合并后生产后缀为.orig的备份文件

posted @ 2016-05-27 21:01  ray0324  阅读(774)  评论(0)  编辑  收藏  举报