Use any of these methods to set up IBM® Rational® Synergy with IBM Rational Rhapsody® DiffMerge.
Procedure
- Include the location of the DiffMerge.exe file that is
in the IBM Rational Rhapsody installation
folder (for example, <Rhapsody installation path>\Rhapsody73)
in the PATH environment variable.
- Import the Rational Rhapsody type
definition file into Rational Synergy/CM.
This adds Rational Rhapsody types
to the Rational Synergy Type
Manager. It also links Rational Rhapsody DiffMerge to
perform comparison and merging on Rational Rhapsody files
within Rational Synergy.
For instructions on how to import this file, see step 5 in Setting up Rational Rhapsody for use with Rational Synergy.
- To use the Rational Synergy Text
Diff tool from Rational Rhapsody DiffMerge,
specify these settings from Rational Rhapsody DiffMerge through and set the following values. After you set and save
any changes to these preferences, they are set for every time you
use Rational Rhapsody DiffMerge.
- BaseAwareTextDiffMergeEnabled.
Select the check box (TRUE)
- BaseAwareAutoMergeInvocation.
Enter value of ccm_merge.exe -3edu -l $source1 -r $source2
-a $sourceBase -z $output