[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\""
其中 keepBackup=false可以防止合并后生产后缀为.orig的备份文件
Windows下GIT配置BeyondCompare为默认差异比较工具和合并工具
原文：http://www.cnblogs.com/ray0324/p/5536006.html