The External Compare/Merge Tools Preferences dialog lets you specify an external compare/merge tool to use for file comparison and merging. You must enter command line arguments required to launch the selected external tool. You cannot perform a merge of versions that involves path, name, or status conflicts by using external merge tools. Use the default merge tool to resolve these conflicts.
Note: The selected external compare and merge tool must be installed on your computer before you can use it. Additionally, the path to the selected tool must be listed in the Windows PATH environment variable.
CA Harvest SCM supports the following external difference/merge tools, some of which permit three-way merge:
Note: For operating system support and version information about the listed external tools, see the Release Notes.
The default tool is Default, which refers to the CA Harvest SCM interactive merge process. The Command Lines fields are disabled when Default is selected and you do not need to specify command line information to start the interactive merge process.
|
Copyright © 2015 CA Technologies.
All rights reserved.
|
|