Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ee7c0964
Commit
ee7c0964
authored
May 18, 2005
by
Lute Kamstra
Browse files
(Overview of Emerge): Add cross reference. Remove duplication.
parent
ae48b251
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
man/ChangeLog
man/ChangeLog
+3
-0
man/maintaining.texi
man/maintaining.texi
+3
-4
No files found.
man/ChangeLog
View file @
ee7c0964
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.
...
...
man/maintaining.texi
View file @
ee7c0964
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment