Previous Topic: Using External Compare Tool from WorkspaceNext Topic: Synchronize Multiple Resources

Using the Plug-In for Eclipse › Using External Compare Tool from Workspace › Configure Three-Way Compare for Workspace

Configure Three-Way Compare for Workspace

If you configured an external compare tool for the Eclipse plug-in, CA Harvest SCM Explorer uses the same tool for comparisons. The default mode is two-way comparison. If you want to enable three-way comparison, you must configure the same.

To configure three-way compare for Workspace

  1. Click Windows, Preferences, Team, CA Harvest SCM from the Eclipse plug-in.

    The Preferences dialog appears.

  2. Navigate to General, Compare/Merge, External Compare/Merge Tools.

    The right pane displays the details of the tool that you have already configured and the associated command line options.

  3. Select one of the following options under Compare Tool Options:
    2-way

    Specifies that the compare and merge operation will use two-way comparison.

    3-way

    Specifies that the compare and merge operation will use three-way comparison.

    Note: WinMerge does not support three-way comparison. DiffDoc does not support two-way and three-way comparisons. For more information about the parameters in the previously mentioned commands, see Default Command Line Settings.

  4. Click OK.

    The changes are saved. You can now perform the comparisons in the configured mode from Workspace.