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\"
版权声明:本文为w6611415原创文章,遵循CC 4.0 BY-SA版权协议,转载请附上原文出处链接和本声明。