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 msysgit
cmd = "C:\Program Files\Devart\Code Compare\codemerge.exe" "/TF=$REMOTE" "/MF=$LOCAL" "/RF=$MERGED" "/BF=$BASE"
My merge section looks 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'm missing ?
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
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With