User Guide - MKS

Chapter 10: Branching and Merging Revisions
328
Editing Merge Results
Once you are working in Merge mode in MKS Visual Difference you can
directly edit the merge result if necessary.
In MKS Visual Difference you can cut, copy, and paste text in the merge
result. MKS Visual Difference highlights the edited text and displays the
edit icon ( ) next to the line number. You can access editing functions in
the following ways:
From the Edit menu, select Cut, Copy, Paste, or Select All.
From the toolbar, click the Cut, Copy, or Paste buttons.
From the shortcut menu, select Cut, Copy, Paste, or Select All.
Use the following shortcut keys:
Cut = CTRL+X
Copy = CTRL+C
Paste = CTRL+V
Select All = CTRL+A
You can also add and delete text by selecting a line within the merge result
and type or delete as required.
Reverting Merge Results
If you have made changes to the merge result file that you want to discard,
you can revert the merge result file to its last saved state or revert a
particular block.
To revert merge results in the graphical user interface
1 Do one of the following:
Select Edit > Revert Merge Result File.
Click .
The merge result file is reverted to its last saved state.
To revert merge results by block in the graphical user interface
1 Select the block you want to revert in the merge result file.
2 Select Edit > Revert Block.
The block is replaced with the adjacent block in the Merge To.
u s e r g u i d e