User Guide - MKS

Chapter 4: Source Integrity Interfaces
104
NOTE
Under the View menu, the following controls are also available:
Synchronize Scrolling causes all of the panes to scroll simultaneously. This
control is enabled by default.
Ignore Blanks ignores white space at the end of lines, and changes it to white
space elsewhere in the line.
View Panes
The view panes appear within the MKS Visual Merge window and display
the revisions you are comparing including line numbers for navigation
(line numbers can be removed through the MKS Visual Merge options).
There are two different layouts for the view panes, vertical layout and split
layout.
The vertical layout displays the three revisions side-by-side for
comparison. You can view the Merge From, Merge Base and Merge To
revisions.
The split layout displays in four panes for comparison. The Merge From,
Merge Base and Merge To revisions are displayed side-by-side, and the
Merge Result appears below them.
In the Merge Result pane a number immediately to the left of the line
numbers appears to indicate which revision — Merge From (1), Merge Base
(2) or Merge To (3) — the block originated from.
To change the layout of the view panes, use the View vertical layout and
View split layout buttons on the toolbar, or select View > Vertical Pane
Layout or View > Split Pane Layout.
The Merge From is the revision from which blocks are merged.
The Merge Base is the revision you want to use as the base for calculating
differences against the Merge From to be applied to the Merge To.
The Merge To is the working file, and is used as the basis for the Merge
Result file.
The Merge Result file is the file that blocks are merged into, and can be
edited and saved to contain the output of the merge.
Scrolling in the view panes is synchronized.
u s e r g u i d e