Git merge/compare tool setup

前端 未结 2 1747
不思量自难忘°
不思量自难忘° 2021-02-10 17:43

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

2条回答
  •  梦毁少年i
    2021-02-10 18:14

    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
    

提交回复
热议问题