User Guide - Mks.com

Chapter 4: Source Integrity Interfaces
Modes
104
Shortcut Menu
MKS Visual Difference supports standard shortcut menus in Merge mode.
To display the menu of actions you can perform, select a line in any pane
and right click. MKS Visual Difference displays the applicable shortcut
menu.
The available actions displayed in the shortcut menu depends on whether
you right click within the Merge From, Merge To or the Merge Result view
panes.
Shortcut Keys
For some operations, shortcut keys are provided. Shortcut keys appear on
menus opposite their operation names.
NOTE
In MKS Visual Difference, the operations available in a given menu depends on
which mode you are working in. For information on modes, see “Modes” on
page 104
Status Bar
The status bar provides a short summary of the difference blocks for Merge
From and Merge To. It shows insertions, deletions, and changes with a
number indicating how many of each exist.
MKS Visual Difference can operate in two different modes depending on
what it is being used for. Since Visual Difference is both a differencing tool
and a merging tool, it has a Differences mode and a Merge mode.
The Differences mode is used to compare revisions and display the
differences between them. No merging operations are available in the
Differences mode.
The Merge mode is used for all merging related operations and editing.
You can toggle between the two modes in Visual Difference by selecting
File > Differences or File > Merge, or you can click the Differences or Merge
buttons on the toolbar.
When you switch from the Differences mode to the Merge mode, the
Reassign Merge Roles dialog box is displayed. This dialog box allows you
to specify which revision you want as the Merge From and Merge To.
A bullet is displayed next to the mode currently being used.
u s e r g u i d e