git - Git merge/比较工具设置

我正在尝试将codecompare设置为git merge/diff工具，但是我一直收到一个错误，即我的.gitconfig文件中的以下行不正确，我在使用msysgit的windows上

 cmd = "C:\Program Files\Devart\Code Compare\codemerge.exe" "/TF=$REMOTE" "/MF=$LOCAL" "/RF=$MERGED" "/BF=$BASE"

我的合并部分如下所示

[merge]
tool = codecompare
[mergetool "codecompare"]
cmd = "C:\Program Files\Devart\Code Compare\codemerge.exe" "/TF=$REMOTE" "/MF=$LOCAL" "/RF=$MERGED" "/BF=$BASE"
keepBackup = false
trustExitCode = false

我有什么遗漏吗？

最佳答案

我发现这个效果更好
http://mnaoumov.wordpress.com/2012/09/13/git-devart-codecompare-integration/

[diff]
    tool = codecompare
    guitool = codecompare
[merge]
    tool = codecompare
[mergetool]
    keepBackup = false
[difftool "codecompare"]
    cmd = 'C:/Program Files/Devart/Code Compare/CodeCompare.exe' \"$LOCAL\" \"$REMOTE\"
    renames = true
[mergetool "codecompare"]
    cmd = 'C:/Program Files/Devart/Code Compare/CodeMerge.exe' -MF=\"$LOCAL\" -TF=\"$REMOTE\" -BF=\"$BASE\" -RF=\"$MERGED\"
    trustExitCode = true