Display

The controls on this page are used to configure the behaviour and appearance of file comparison windows.

Show line numbers and byte offsets

When this option is checked, Merge will display line numbers and byte offsets at the left of each file panel.

Indicate where changes are concealed at line ends

Check this option to have Merge display an indicator at the end of each line that contains changes located off the right-hand edge of the visible portion of the line.

Show CR and LF characters

When this option is checked, Merge will show the Carriage Return and/or Line Ending characters at the end of each line. This is purely a visual option, and does not affect the line endings used when files are saved (you can choose those in the Save dialog).

Show whitespace characters

Check this option to show whitespace characters in text comparisons.

Wrap long lines

Check this option to have Merge use multiple lines on the screen to display a long line of text.

Break lines at word boundaries

Check this option to wrap text at word boundaries instead of at the character nearest the edge.

Show only # lines of context around changes

Check this option to collapse sections of unchanged lines. The adjacent entry field can be used to specify how many lines should be shown at the top and bottom of the collapsed section to provide some context for the collapsed lines.

Show number of omitted unchanged lines

Check this option to display a count of lines that have been hidden in a collapsed block of unchanged lines.

Add vertical padding to align changes

Check this option to add padding below text blocks as required to keep all related changes vertically aligned. This setting can be especially useful in conjunction with the Intelligently split blocks of changed text based on matched line pairs option.

Information This option ensures only that related blocks of changed and unchanged text remain aligned. If you wish to align consecutive individual lines within those blocks, you will also need to ensure that the Wrap long lines option (see above) is unchecked. With line-wrapping enabled, individual lines within blocks of changed and unchanged text will not generally remain aligned.