Index: emacs/man/maintaining.texi
diff -c emacs/man/maintaining.texi:1.35 emacs/man/maintaining.texi:1.36
*** emacs/man/maintaining.texi:1.35 Mon Apr 11 16:40:42 2005
--- emacs/man/maintaining.texi Wed May 18 14:30:59 2005
***************
*** 963,972 ****
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.
The merge buffer uses a special major mode, Emerge mode, with commands
for making these choices. But you can also edit the buffer with
--- 963,971 ----
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 (@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
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
