Options Menu

The Options Menu in the Merging Window contains the following components. The first five options on this menu are toggles-- that is, you can turn them on and off by selecting them. A small box appears to the left of an option when it is on:

Automerge Automatically resolves any nonconflicting differences and constructs a merged version in the Merged Result Pane. The default setting is on.
Scroll Together Enables you to set the text panes so they scroll together (corresponding lines are alway aligned in each window) or scroll separately. The default setting is Scroll Together.
Show Line Numbers Displays line numbers in the unmerged files.
Show Line Ends Displays a small black box at the end of each line in the unmerged files.
Show Diff Navigator Displays the Diff Navigator between the two unmerged files. The Diff Navigator displays differences between the two files as colored lines. Click on the scroll boxes on either side of the Diff Navigator to move through either file, or click on the arrows on the top or bottom to move the same distance in both files.
Tab Display Enables you to customize tab stops. You can select:
Control Character(^I) Displays the ^I control character for each tab space. The default setting is on.
Spaces Sets the number of spaces in each tab stop to 1, 2, 3, 4, 6, 8, 10, 12, or 16. The default is 8.
Diff Options Lets you customize diff behavior. You can choose:
Ignore trailing white space Ignores trailing white space when finding lines that differ. The default setting is off.
Ignore all white space Ignores embedded and trailing space when finding lines that differ. The default setting is off.
Suppress case sensitivity Ignores upper and lower case when finding lines that differ. The default setting is off.

Automerge	Automatically resolves any nonconflicting differences and constructs a merged version in the Merged Result Pane. The default setting is on.
Scroll Together	Enables you to set the text panes so they scroll together (corresponding lines are alway aligned in each window) or scroll separately. The default setting is Scroll Together.
Show Line Numbers	Displays line numbers in the unmerged files.
Show Line Ends	Displays a small black box at the end of each line in the unmerged files.
Show Diff Navigator	Displays the Diff Navigator between the two unmerged files. The Diff Navigator displays differences between the two files as colored lines. Click on the scroll boxes on either side of the Diff Navigator to move through either file, or click on the arrows on the top or bottom to move the same distance in both files.
Tab Display	Enables you to customize tab stops. You can select:
	Control Character(^I)	Displays the ^I control character for each tab space. The default setting is on.
	Spaces	Sets the number of spaces in each tab stop to 1, 2, 3, 4, 6, 8, 10, 12, or 16. The default is 8.
Diff Options	Lets you customize diff behavior. You can choose:
	Ignore trailing white space	Ignores trailing white space when finding lines that differ. The default setting is off.
	Ignore all white space	Ignores embedded and trailing space when finding lines that differ. The default setting is off.
	Suppress case sensitivity	Ignores upper and lower case when finding lines that differ. The default setting is off.