TortoiseGit Integration

Setting Up Diff Tool

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

  1. In Windows Explorer, select TortoiseGit -> Settings from the TortoiseGit popup menu.
  2. Navigate to Settings->External Programs->Diff Viewer.
  3. On the Diff Viewer page, select the External radio button.

  4. Enter the following data in the respective fields:

    Command: “[InstallationDir]\CodeCompare.exe”

    Arguments: %base %mine

TortoiseGit diff tool

Setting Up Merge Tool

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

  1. In Windows Explorer, select TortoiseGit -> Settings from the TortoiseGit popup menu.
  2. Navigate to Settings->External Programs->Merge Tool.
  3. On the Merge Tool page, select the External radio button.

  4. Enter the following data in the respective fields:

    Command: “[InstallationDir]\CodeMerge.exe”

    Arguments: /TF=%theirs /MF=%mine /RF=%merged /BF=%base /REMOVEFILES

TortoiseGit merge tool

Note

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