mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-05 20:43:08 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Lute Kamstra 2005-05-18 14:31:32 +00:00
parent ae48b25170
commit ee7c0964ef
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/ChangeLog
View File

@ -1,5 +1,8 @@
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.

7
man/maintaining.texi
View File

@ -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