963 |
|
|
964 |
After the comparison is done and the buffers are prepared, the |
After the comparison is done and the buffers are prepared, the |
965 |
interactive merging starts. You control the merging by typing special |
interactive merging starts. You control the merging by typing special |
966 |
@dfn{merge commands} in the merge buffer. The merge buffer shows you a |
@dfn{merge commands} in the merge buffer (@pxref{Merge Commands}). |
967 |
full merged text, not just differences. For each run of differences |
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 |
which one of them to keep, or edit them both together. |
|
edit them both together. |
|
969 |
|
|
970 |
The merge buffer uses a special major mode, Emerge mode, with commands |
The merge buffer uses a special major mode, Emerge mode, with commands |
971 |
for making these choices. But you can also edit the buffer with |
for making these choices. But you can also edit the buffer with |