[user]email = ray0324@foxmail.comname = 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 = falsekeepBackup = false[mergetool "bc"]cmd = "\"D:/Program Files/BeyondCompare/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""

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