【原文:http://blog.youkuaiyun.com/w6611415/article/details/19755513 感谢作者】
sourcetree里设置不管用,google了下,可以通过修改 ~/.gitconfig 文件来实现。
[diff]
tool = sourcetree
[difftool]
prompt = false
[difftool "sourcetree"]
cmd = 'C:/Program Files/Beyond Compare v3.3.4/App/BeyondCompare/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[merge]
tool = sourcetree
[mergetool]
prompt = false
[mergetool "sourcetree"]
trustExitCode = true
cmd = 'C:/Program Files/Beyond Compare v3.3.4/App/BeyondCompare/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"