Compare++ as a Diff and Merge tool with Git

Through a very simple command line interface, Compare++ can integrate into many IDEs as Microsoft Visual Studio, and version control systems such as git, TFS(Microsoft Team Fundation Server), TortoiseSVN/ CVS, SourceOffSite and so on.

Here, take Git for instance to demo how to config Compare++ as the comparison tool.

Edit your git config file "C:/Program Files/git/etc/config":

[diff]

tool = cmpp

[difftool]

prompt = false

[difftool "cmpp"]

cmd = \"C:/Program Files/Coode Software/Compare++/Compare++.exe\" \"$LOCAL\" \"$REMOTE\"

[merge]

tool = cmpp

[mergetool]

prompt = false

keepBackup = false

[mergetool "cmpp"]

cmd = \"C:/Program Files/Coode Software/Compare++/Compare++.exe\" \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\"

trustExitCode = true