Git customization merge / compare tools

Question

I am trying to install CodeCompare as a git tool, however I get an error all the time that the following line is incorrect in my .gitconfig file, I am in windows using msysgit

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

My merge section is as follows

 [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 

Is there something I am missing?

Answer 1

I really found this to work better

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

Try the following configuration:

 [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