summaryrefslogtreecommitdiff
path: root/man/maintaining.texi
diff options
context:
space:
mode:
authorLute Kamstra <lute@gnu.org>2005-05-18 14:31:32 +0000
committerLute Kamstra <lute@gnu.org>2005-05-18 14:31:32 +0000
commitee7c0964efddcae0a4125450316486221b1bd834 (patch)
treec506649bda1d8a897acfda34593cbf500e3f100c /man/maintaining.texi
parentae48b25170ed8a6412efbbe52d92b901a824bfe1 (diff)
downloademacs-ee7c0964efddcae0a4125450316486221b1bd834.tar.gz
(Overview of Emerge): Add cross reference. Remove duplication.
Diffstat (limited to 'man/maintaining.texi')
-rw-r--r--man/maintaining.texi7
1 files changed, 3 insertions, 4 deletions
diff --git a/man/maintaining.texi b/man/maintaining.texi
index 347a15d3c95..b11ae6b6cdd 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -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