Code Compare Integration with Git Extensions

When managing Git repositories through a standalone UI tool - Git Extensions, using Code Compare can significantly speed up comparing and merging conflicts.

To use Code Compare with Git Extensions, you need to add the following lines to the gitconfig file: 

[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

Note: The global gitconfig file is located in C:\Users\MyLogin\.gitconfig. The config file for a local repository is located in repository root in the ".git" folder (this folder is hidden by default).

We use cookies to provide you with a better experience on the Devart website. You can read more about our use of cookies in our Cookies Policy.
Click OK to continue browsing the Devart site. Be aware you can disable cookies at any time.