Previous Topic: Specify the Plug-In BehaviorNext Topic: Specify Log Options

Installing and Configuring the Plug-In › Set Preferences › Specify Compare/Merge Utilities

Specify Compare/Merge Utilities

You select an external (third-party) utility for the CA Harvest SCM compare process to use, because the plug-in does not provide an internal compare/merge utility. After you select any of the utilities, and depending on if the selected utility is installed in the system path, the utility is invoked when you use the plug-in.

The following external compare/merge utilities (and their corresponding command lines) are supported:

Note: You can also use custom utilities.

A two-way merge configuration is provided for Araxis, Beyond Compare, and Guiffy. The two-way compare-merge tool is invoked for the following scenarios:

  1. The Synchronizer detects a conflict.
  2. From the Synchronizer tree view, double-click the conflicted item, or right-click the conflicted item and select Compare with Repository.

or

  1. The Harvest SCM Explorer tree or Lists view has an item with an M-tag.
  2. From the Harvest SCM Explorer Lists view, right-click an M-tagged version and select the interactive merge process.

To specify compare/merge utilities

  1. Open the Visual Studio IDE, and select Tools, Options.

    The Options window appears.

  2. Expand the Source Control node, and click Compare-Merge.

    The Compare/Merge options appear.

  3. Complete the options as appropriate.
    Utility Type

    Specifies a utility, from a range of third-party merge utilities that are pre-installed on the local computer, to start when you invoke a compare operation in the IDE.

    Utility Path

    Specifies a utility and its corresponding path to use for compare/merge functions. When the selected utility is installed, and its executable file exists in the system path, you do not need to select a path. You can also select a utility by using the Utility Path selection button directly.

    CommandLine

    Specifies a command-line invocation argument for the utility type that you specified. The plug-in automatically produces the default command-line invocation argument for that utility. You can modify and save any of the command-line parameters for the preconfigured or custom utilities.

    Click OK.

    The compare/merge utilities are specified for the plug-in.