Mercurial > emacs
changeset 62479:0659ac37d53c
(Overview of Emerge): Add cross reference. Remove duplication.
| author | Lute Kamstra <lute@gnu.org> |
|---|---|
| date | Wed, 18 May 2005 14:30:59 +0000 |
| parents | 92a32033e324 |
| children | 4e31dc004111 |
| files | man/maintaining.texi |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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