[user]
name = xxxx@xx.cn
email = xxxx@xx.cn
[gui]
encoding = utf-8
[merge]
tool=bc4
[diff]
tool=bc4
[difftool]
prompt = false
[difftool "bc4"]
cmd = "\"D:/QQFile/Beyond Compare/BCompare.exe\" \"$LOCAL\" \"$REMOTE\""
[merge]
tool=bc
[mergetool]
prompt=false
[mergetool "bc4"]
#trustExitCode = true
cmd = \"D:/QQFile/Beyond Compare/BCompare.exe\" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"