diff options
| author | Lute Kamstra | 2005-05-18 14:31:32 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-05-18 14:31:32 +0000 |
| commit | ee7c0964efddcae0a4125450316486221b1bd834 (patch) | |
| tree | c506649bda1d8a897acfda34593cbf500e3f100c | |
| parent | ae48b25170ed8a6412efbbe52d92b901a824bfe1 (diff) | |
| download | emacs-ee7c0964efddcae0a4125450316486221b1bd834.tar.gz emacs-ee7c0964efddcae0a4125450316486221b1bd834.zip | |
(Overview of Emerge): Add cross reference. Remove duplication.
| -rw-r--r-- | man/ChangeLog | 3 | ||||
| -rw-r--r-- | man/maintaining.texi | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 4a6d2dd07bb..cc6b7a89c16 100644 --- a/man/ChangeLog +++ b/man/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2005-05-18 Lute Kamstra <lute@gnu.org> | 1 | 2005-05-18 Lute Kamstra <lute@gnu.org> |
| 2 | 2 | ||
| 3 | * maintaining.texi (Overview of Emerge): Add cross reference. | ||
| 4 | Remove duplication. | ||
| 5 | |||
| 3 | * emacs.texi (Top): Update to the current structure of the manual. | 6 | * emacs.texi (Top): Update to the current structure of the manual. |
| 4 | * misc.texi (Emacs Server): Add menu description. | 7 | * misc.texi (Emacs Server): Add menu description. |
| 5 | * files.texi (Saving): Fix menu. | 8 | * files.texi (Saving): Fix menu. |
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. | |||
| 963 | 963 | ||
| 964 | After the comparison is done and the buffers are prepared, the | 964 | After the comparison is done and the buffers are prepared, the |
| 965 | interactive merging starts. You control the merging by typing special | 965 | interactive merging starts. You control the merging by typing special |
| 966 | @dfn{merge commands} in the merge buffer. The merge buffer shows you a | 966 | @dfn{merge commands} in the merge buffer (@pxref{Merge Commands}). |
| 967 | full merged text, not just differences. For each run of differences | 967 | For each run of differences between the input texts, you can choose |
| 968 | between the input texts, you can choose which one of them to keep, or | 968 | which one of them to keep, or edit them both together. |
| 969 | edit them both together. | ||
| 970 | 969 | ||
| 971 | The merge buffer uses a special major mode, Emerge mode, with commands | 970 | The merge buffer uses a special major mode, Emerge mode, with commands |
| 972 | for making these choices. But you can also edit the buffer with | 971 | for making these choices. But you can also edit the buffer with |