Merge Tool Parameters

The following table displays the Merge Tool parameters which can be specified in the Configuration file, and their default values if no Configuration file is specified and no changes are made in the Configuration dialog box:

Option

Value

Ancestor

Enter ancestor file name which can, optionally, be followed by a comma (,) and a label string. If a user label string is not specified, a default label is provided.

Target

Enter target file name which can, optionally, be followed by a comma (,) and a label string. If a user label string is not specified, a default label is provided.

Derivatives

Enter derivative file names, separated by a semi colon (;). Each derivative can be followed by a comma (,) and a label string. If a user label is not specified, a default label is provided.

Interactive

Indicates whether you are prompted to save the target when exiting the Merge Tool.

To be prompted, use Always.

To not be prompted, use Browse.

The default value is Always.

AutoMerge

Insert differences into the Target file automatically at startup.

To disable automatic merge, use Off.

To enable automatic merge, use On.

The default value is Off.

IgnoreCase

Indicates whether case is ignored when comparing text

To ignore case, use On.

To make comparisons case-sensitive, use Off.

The default value is Off.

IgnoreBlanks

Indicates whether whitespace is ignored when comparing text

To ignore all whitespace, use All.

To ignore trailing whitespace, use Trailing.

To include whitespace, use None.

The default value is None.

ShowConsolidated

Shows or hides the Consolidated Views window on startup.

To hide the Consolidated Views window, use Off.

To show the Consolidated Views window, use On.

The default value is Off.

ShowTarget

Shows or hides the Target window on startup.

To hide the Target window, use Off.

To show the Target window, use On.

The default value is Off.

ShowAncestor

Shows or hides the Ancestor window on startup.

To hide the Ancestor window, use Off.

To show the Ancestor window, use On.

The default value is Off.

FrameAutoResize

Automatically resizes the Derivative Frame windows.

To not autoresize the window, use Off.

To autoresize the window, use On.

The default value is Off.

IncludeFrameAncestor

Allows the Ancestor to be included in the Derivative Frame window.

To not include the Ancestor, use Off.

To include the Ancestor, use On.

The default value is Off.

ShowFrameAncestor

Shows the Ancestor in the Derivative Frame window on startup.

To not show the Ancestor, use Off.

To show the Ancestor, use On.

The default value is Off.

IncludeFrameConsolidated

Allows the Consolidated View to be included in the Derivative Frame window.

To not include the Consolidated View, use Off.

To include the Consolidated View, use On.

The default value is Off.

ShowFrameConsolidated

Shows the Consolidated View in the Derivative Frame window on startup.

To not show the Consolidated View, use Off.

To show the Consolidated View, use On.

The default value is Off.

ShowDeletedText

Shows or hides the text of deleted lines.

To not show deleted text, use Off.

To show deleted text, use On.

The default value is Off.

ConflictHeight

Sets the number of lines above and below the selected line in the Global View window.

Enter an Integer Number.

The default value is 2.

TabWidth

Sets the number of spaces displayed per tab.

Enter an Integer Number.

The default value is 4.

SaveOnExit

Automatically saves the Target file on exit.

To not automatically save the Target, use Off.

To automatically save the Target, use On.

The default value is Off.

Related Topics

Selecting the Files

Configuration Dialog Box

About Serena Merge Tool Configuration Files