git mergetool

win系统下，直接修改config文件即可，但要注意win和linux的路径差异，通常config文件在‪C:\Users\用户名\.gitconfig

以下是配置好的

[diff]
    tool = BComparePortable
[difftool "BComparePortable"]
    cmd = "d:/beyondcompare/BComparePortable.exe"  $LOCAL $REMOTE
[merge]
    tool = BComparePortable
[mergetool]
    keepBackup = false
[mergetool "BComparePortable"]
    cmd = "D:/beyondcompare/BComparePortable.exe" $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
    trustExitCode = false