# HG changeset patch # User Lute Kamstra # Date 1116426659 0 # Node ID 0659ac37d53cfaed69cafa1b78718c7c62248b1b # Parent 92a32033e3247308850cc9ac2895199f4af24816 (Overview of Emerge): Add cross reference. Remove duplication. diff -r 92a32033e324 -r 0659ac37d53c man/maintaining.texi --- a/man/maintaining.texi Wed May 18 14:24:26 2005 +0000 +++ b/man/maintaining.texi Wed May 18 14:30:59 2005 +0000 @@ -963,10 +963,9 @@ 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