Reinvent your SQL coding with the newly released dbForge AI Assistant
Learn more

Code Compare Integration with TortoiseGit

In order to set Code Compare as the default diff tool for TortoiseGit, perform the following steps:

  1. Select TortoiseGit → Settings from the TortoiseGit popup menu in Windows Explorer.
  2. Switch to the Diff Viewer page.
  3. Select the External radio button.
  4. Command: " [InstallationDir]\CodeCompare.exe" /SC=Git %base %mine
  5. To work with comments in Review Assistant, you need to specify additional arguments: /SC=TortoiseGit /p1=%bpath /p2=%ypath /r1=%brev /r2=%yrev %base %mine
GIT Diff tool

In order to set Code Compare as the default merge tool for TortoiseGit , perform the following steps:

  1. Select TortoiseGit → Settings from the TortoiseGit popup menu in Windows Explorer.
  2. Switch to the Settings → External Programs → Merge Tool page.
  3. Select the External radio button.
  4. Command: " [InstallationDir]\CodeMerge.exe" /TF=%theirs /MF=%mine /RF=%merged /BF=%base /REMOVEFILES
GIT Merge tool

Note: Use your product installation folder instead of [InstallationDir]. By default, it is C:\Program Files\Devart\Code Compare.

For a brief introduction to the features of our diff and merge tool, refer to the product's overview page.