Use a merge configuration file to control merge options when merging files from the command line. You specify a merge configuration file as the argument to the pvcsmerge command.
The following example configuration file starts the Serena Merge tool with an ancestor file named "proj_1.0.c", a target file named "proj_1.1.c, and two derivatives, "proj_1.01.c" and proj_1.02.c".
#Labels are in double quotation marks
Ancestor=proj_1.0.c, "Ancestor"
Target=proj_1.1.c, "Target"
Derivatives=proj_1.01.c, "Derivative1"; proj_1.02.c,"Derivative2"
Interactive=Always
AutoMerge=On
IgnoreCase=Off
IgnoreBlanks=None
ShowConsolidated=Off
ShowTarget=Off
ShowAncestor=Off
FrameAutoResize=On
IncludeFrameAncestor=On
ShowFrameAncestor=On
IncludeFrameAncestor=On
ShowFrameAncestor=On
ShowDeletedText=Off
ConflictHeight=2
NumberDerivatives=3
TabWidth=4
SaveOnExit=Off
NOTE You do not have to specify all the above merge parameters, only Ancestor and Derivatives are mandatory.
Related Topics