If you have configured an external compare tool for Workbench, CA Harvest SCM uses the same tool for comparisons at the WorkArea also. The default mode is two-way comparison. If you want to change the comparison mode, you must configure the same.
Follow these steps:
The Preferences dialog appears.
The right pane displays the details of the tool that you have already configured and the associated command line options.
Specifies that the compare and merge operation will use two-way comparison.
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 comparison. For more information about the parameters in the previously mentioned commands, see Default Command Line Settings.
The changes are saved. You can now perform the comparisons in the configured mode from WorkArea.
|
Copyright © 2015 CA Technologies.
All rights reserved.
|
|