Commit ee7c0964 authored by Lute Kamstra's avatar Lute Kamstra
Browse files

(Overview of Emerge): Add cross reference. Remove duplication.

parent ae48b251
2005-05-18 Lute Kamstra <lute@gnu.org>
* maintaining.texi (Overview of Emerge): Add cross reference.
Remove duplication.
* emacs.texi (Top): Update to the current structure of the manual.
* misc.texi (Emacs Server): Add menu description.
* files.texi (Saving): Fix menu.
......
......@@ -963,10 +963,9 @@ variant B, and the common ancestor.
After the comparison is done and the buffers are prepared, the
interactive merging starts. You control the merging by typing special
@dfn{merge commands} in the merge buffer. The merge buffer shows you a
full merged text, not just differences. For each run of differences
between the input texts, you can choose which one of them to keep, or
edit them both together.
@dfn{merge commands} in the merge buffer (@pxref{Merge Commands}).
For each run of differences between the input texts, you can choose
which one of them to keep, or edit them both together.
The merge buffer uses a special major mode, Emerge mode, with commands
for making these choices. But you can also edit the buffer with
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment