Next: Exiting Emerge Prev: State of Difference Up: Emerge
Here are the Merge commands for Fast mode; in Edit mode, precede them
with `C-c C-c':
Select the previous difference.
Select the next difference.
Choose the A version of this difference.
Choose the B version of this difference.
Select a particular difference; specify the sequence number of that
difference as a prefix argument.
Select the difference containing point. You can use this command
in the merge buffer or in the A or B buffer.
Quit--finish the merge.
Abort--exit merging and do not save the output.
Go into Fast mode. (In Edit mode, this is actually `C-c C-c f'.)
Go into Edit mode.
Recenter (like `C-l') all three windows.
Specify part of a prefix numeric argument.
Also specify part of a prefix numeric argument.
Choose the A version as the default from here down in the merge
Choose the B version as the default from here down in the merge
Copy the A version of this difference into the kill ring.
Copy the B version of this difference into the kill ring.
Insert the A version of this difference at the point.
Insert the B version of this difference at the point.
Put the point and mark around the difference region.
Scroll all three windows down (like `M-v').
Scroll all three windows up (like `C-v').
Scroll all three windows left (like `C-x <').
Scroll all three windows right (like `C-x >').
Reset horizontal scroll on all three windows.
Shrink the merge window to one line. (Use `C-u l' to restore it
to full size.)
Combine the two versions of this difference.
Show the files/buffers Emerge is operating on in Help window.
(Use `C-u l' to restore windows.)
Join this difference with the following one. (`C-u x j' joins
this difference with the previous one.)
Split this difference into two differences. Before you use this
command, position point in each of the three buffers to the place
where you want to split the difference.
Trim identical lines off top and bottom of the difference. Such
lines occur when the A and B versions are identical but differ
from the ancestor version.
automatically generated by info2www