Mercurial > emacs
comparison man/maintaining.texi @ 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 | 0d13c2e5baa9 |
children | 3723093a21fd f042e7c0fe20 |
comparison
equal
deleted
inserted
replaced
62478:92a32033e324 | 62479:0659ac37d53c |
---|---|
961 text. These commands read three file or buffer names---variant A, | 961 text. These commands read three file or buffer names---variant A, |
962 variant B, and the common ancestor. | 962 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 |
973 ordinary Emacs commands. | 972 ordinary Emacs commands. |
974 | 973 |