Question

我正在尝试将CodeCompare设置为我的git merge / diff工具，但是我的.gitconfig文件中出现以下行不正确的错误，我在Windows上使用msysgit

 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

我有什么遗失的吗？

Answer 1

我实际上发现这个效果更好

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

Answer 2

尝试以下配置：

[difftool "codecompare"]
   cmd = 'C:\\Program Files\\Devart\\Code Compare\\codecompare.exe' "$LOCAL" "$REMOTE"
   renames = true
[diff]
   tool = 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

Git合并/比较工具设置

2 个答案: