User Guide - Mks.com

View Panes
MKS Visual Difference Interface
The view panes appear within the MKS Visual Difference window and
display the revisions you are comparing including line numbers for
navigation (line numbers can be removed through the MKS Visual
Difference options). Scrolling in the view panes is synchronized.
In Merge mode, there are two different layouts for the view panes, vertical
layout and split layout.
The vertical layout displays two revisions side-by-side for comparison.
You can view either the Merge From and Merge To, or by clicking the View
Merge Result button, you can view the Merge From and the Merge Result.
The split layout displays three revisions for comparison. The Merge From
and Merge To are displayed side-by-side, and the Merge Result pane
appears below them.
In the Merge Result a number immediately to the left of the line numbers
appears to indicate which revision, Merge From (1) or Merge To (2), the
block originated from.
To change the layout of the view panes in Merge mode, use the View
vertical layout and View split layout buttons on the toolbar, or select View >
Vertical Pane Layout or View > Split Pane Layout.
To display a specific line of code, select View > Go to Line or click . In
the Go to dialog box, from the File list, select the file that contains the line
you want to view. In the Go to Line field, enter the number of the line, for
example, 33. The line of code is displayed in the center of the pane if it
exists in a scrolling region.
The Merge From is the revision or working file (as specified by the
Reassign Merge Roles dialog box), from which blocks are merged. For
information on the Reassign Merge Roles dialog box, see “Merging Two
Revisions” on page 356.
The Merge To is the revision or working file (as specified by the Reassign
Merge Roles dialog box), that the Merge Result file is based on.
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.
The Differences mode uses only the vertical layout, which displays the two
selected revisions side-by-side for comparison.
103