[difftool "codecompare"] cmd = \"C:\\Program Files\\Devart\\Code Compare\\CodeCompare.exe\" -W \"$LOCAL\" \"$REMOTE\" renames = true
[diff] tool = codecompare guitool = 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 guitool = codecompare
|