Code Compare Integration with Team Foundation Server (TFS)

In this guide, we'll show how to integrate external diff and merge tools with TFS by using Code Compare as an example.

To integrate Code Compare into Team Foundation Server, open the Visual Studio options (Tools → Options). In the displayed dialog box, select the Source Control → Visual Studio Team Foundation Server node. Click the Configure User Tools button to set up diff and merge tools. Click the Add button to add an external tool for comparison or merging.

Code Compare as Diff Tool for TFS

Enter the following data in the Configure Tool window to set Code Compare as the default comparison tool:

  1. Extension: .*
  2. Operation: Compare
  3. Command: [InstallationDir]\CodeCompare.exe
    (You can use the Browse button to find the required executable file).
  4. Arguments: /SC=TFS /W /T1=%6 /T2=%7 %1 %2

Code Compare as Merge Tool for TFS

Enter the following data in the Configure Tool window to set Code Compare as the default merge tool:

  1. Extension: .*
  2. Operation: Merge
  3. Command[InstallationDir]\CodeMerge.exe
  4. Arguments/TF=%1 /MF=%2 /RF=%4 /BF=%3 /TT=%6 /MT=%7 /SC=TFS

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