atlassian-sourcetree - 是否在Sourcetree中将Devart的代码比较设置为自定义差异和合并工具？

Question

如何在Sourcetree中添加Devart的Code Compare作为自定义差异和合并工具？

Answer 1

我通过添加像Alex建议的代码来修改了C:\Users\[User Name]\.gitconfig文件:

[difftool "codecompare"]
cmd = 'C:\\Program Files\\Devart\\Code Compare\\codecompare.exe' -W \"$LOCAL\" \"$REMOTE\" 
renames = true

[diff]
tool = codecompare
guitool = codecompare

[mergetool "codecompare"]
cmd = 'C:\\Program Files\\Devart\\Code Compare\\codemerge.exe' -MF=\"$LOCAL\" -TF=\"$REMOTE\" -BF=\"$BASE\" -RF=\"$MERGED\"
trustExitCode = true

[mergetool]
keepBackup = false

[merge]
tool = codecompare
guitool = codecompare

然后我将SourceTree Tools -> Options -> Diff更改为System Default。

之后，我的Code Compare开始在Visual Studio内正常运行，真是太棒了。

希望能帮助到你!

Code compare integration with source control systems