Git merge/compare tool setup

Question

I\'m trying to setup CodeCompare as my git merge/diff tool, however I keep getting an error that the following line is incorrect in my .gitconfig file, I am on windows using msy

Answer 1

I actually found this works 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