Specifying external tool settings

To select external tool for comparing and merging procedures and functions, on the Compare/Merge tab, click Add or Edit.

In the Name field, enter the tool name to be displayed in the External tool list.

In the Executable file field, specify the path to its executable file.

The predefined external tools have the following executable files:

• Araxis Merge. <Installation directory>\compare.exe. Default value: C:\Program Files\Araxis\Araxis Merge\compare.exe.
• DiffMerge. <Installation directory>\sgdm.exe. Default value: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe.
• KDiff3. <Installation directory>\kdiff3.exe. Default value: C:\Program Files\KDiff3\kdiff3.exe.
• Perforce P4Merge. <Installation directory>\p4merge.exe. Default value: C:\Program Files\Perforce\p4merge.exe.
• TortoiseMerge. <Installation directory>\bin\TortoiseMerge.exe. Default value: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe.

In the Command-line options box, specify the options for comparing two files, merging two files, three-way merge, and automatic three-way merge.

You can leave some of the command-line option fields empty.

You can use the following predefined command-line options:

• %baseCfg. A file from the first configuration.
• %secondCfg. A file from the second configuration, one of the following:
  • configuration stored in a file
  • vendor configuration (new vendor configuration during the update)
  • repository configuration
  • database configuration
• %oldVendorCfg. A file from the old vendor configuration.
• %merged. The output file.
• %baseCfgTitle. The window title for a file from the main configuration.
• %secondCfgTitle. The window title for a file from the second configurtation.
• %oldVendorCfgTitle. The window title for a file from the old vendor configuration.
  

The following default command-line options are available:

• Araxis Merge:
  • Compare two files
  • Merge two files
  • Three-way merge
• Kdiff3 (for Windows and Linux):
  • Compare two files
  • Merge two files
  • Three-way merge
  • Automatic three-way merge
• TortoiseMerge:
  • Compare two files
  • Three-way merge
• Perforce P4Merge (for Windows and Linux):  
  • Compare two files
  • Three-way merge
• DiffMerge:
  • Compare two files
  • Three-way merge