Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Git merge/compare tool setup

Tags:

git

compare

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 ?

like image 480
Daniel Powell Avatar asked Feb 22 '23 05:02

Daniel Powell


1 Answers

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
like image 127
Daniel Powell Avatar answered Mar 05 '23 18:03

Daniel Powell