将Devart的代码比较设置为Sourcetree中的自定义差异和合并工具？

Question

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

Answer 1

我C:\Users\[User Name]\.gitconfig像Alex建议的那样添加了这个文件:

[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中正确运行,这非常棒.

希望能帮助到你!

代码比较与源控制系统的集成

Answer 2

在SourceTree中打开工具>选项>选项卡:差异.

在面板外部Diff/Merge上放置以下数据:

外部差异工具:自定义
差异命令:C:/Program Files/Devart/Code Compare/CodeCompare.exe
参数:$LOCAL $REMOTE

合并工具:自定义
合并命令:C:/Program Files/Devart/Code Compare/CodeMerge.exe
参数:-MF "$LOCAL" -TF "$REMOTE" -BF "$BASE" -RF "$MERGED"