@c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@c Copyright (C) 2004-2015 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ifnottex
@ref{Comparing Files},
@end ifnottex
-and @ref{Top, Ediff,, ediff, The Ediff Manual}.
+and @ref{Top,, Ediff, ediff, The Ediff Manual}.
@menu
-* Overview of Emerge:: How to start Emerge. Basic concepts.
-* Submodes of Emerge:: Fast mode vs. Edit mode.
- Skip Prefers mode and Auto Advance mode.
-* State of Difference:: You do the merge by specifying state A or B
- for each difference.
-* Merge Commands:: Commands for selecting a difference,
- changing states of differences, etc.
-* Exiting Emerge:: What to do when you've finished the merge.
-* Combining in Emerge:: How to keep both alternatives for a difference.
-* Fine Points of Emerge:: Misc.
+* Overview of Emerge:: How to start Emerge. Basic concepts.
+* Submodes of Emerge:: Fast mode vs. Edit mode.
+ Skip Prefers mode and Auto Advance mode.
+* State of Difference:: You do the merge by specifying state A or B
+ for each difference.
+* Merge Commands:: Commands for selecting a difference,
+ changing states of differences, etc.
+* Exiting Emerge:: What to do when you've finished the merge.
+* Combining in Emerge:: How to keep both alternatives for a difference.
+* Fine Points of Emerge:: Miscellaneous issues.
@end menu
@node Overview of Emerge
input. The mode line indicates Auto Advance mode with @samp{A}.
If Skip Prefers mode is in effect, the @kbd{n} and @kbd{p} commands
-skip over differences in states prefer-A and prefer-B (@pxref{State of
-Difference}). Thus you see only differences for which neither version
-is presumed ``correct.'' The mode line indicates Skip Prefers mode with
-@samp{S}.
-
-@findex emerge-auto-advance-mode
-@findex emerge-skip-prefers-mode
- Use the command @kbd{s a} (@code{emerge-auto-advance-mode}) to set or
-clear Auto Advance mode. Use @kbd{s s}
-(@code{emerge-skip-prefers-mode}) to set or clear Skip Prefers mode.
-These commands turn on the mode with a positive argument, turns it off
-with a negative or zero argument, and toggle the mode with no argument.
+skip over differences in states ``prefer-A'' and ``prefer-B''
+(@pxref{State of Difference}). Thus you see only differences for
+which neither version is presumed ``correct''. The mode line
+indicates Skip Prefers mode with @samp{S}. This mode is only relevant
+when there is an ancestor.
+
+@findex emerge-auto-advance
+@findex emerge-skip-prefers
+ Use the command @kbd{s a} (@code{emerge-auto-advance}) to set or clear
+Auto Advance mode. Use @kbd{s s} (@code{emerge-skip-prefers}) to set or
+clear Skip Prefers mode. These commands turn on the mode with a
+positive argument, turn it off with a negative or zero argument, and
+toggle the mode with no argument.
@node State of Difference
@subsection State of a Difference
which one alternative is ``preferred'' (see below).
When you select a difference, its state changes from default-A or
-default-B to plain A or B. Thus, the selected difference never has
+default-B to plain A or B@. Thus, the selected difference never has
state default-A or default-B, and these states are never displayed in
the mode line.
The command @kbd{d a} chooses default-A as the default state, and @kbd{d
-b} chooses default-B. This chosen default applies to all differences
-which you haven't ever selected and for which no alternative is preferred.
+b} chooses default-B@. This chosen default applies to all differences
+that you have never selected and for which no alternative is preferred.
If you are moving through the merge sequentially, the differences you
haven't selected are those following the selected one. Thus, while
moving sequentially, you can effectively make the A version the default
Select difference number @var{n}.
@item .
-Select the difference containing point. You can use this command in the
-merge buffer or in the A or B buffer.
+Select the difference containing point.
+@c [Does not work in the A or B buffer?]
+@c You can use this command in the merge buffer or in the A or B buffer.
@item q
Quit---finish the merge.
Go into Edit mode.
@item l
-Recenter (like @kbd{C-l}) all three windows.
+Recenter (like @kbd{C-l}) all three windows. With an argument,
+reestablish the default three-window display.
@item -
Specify part of a prefix numeric argument.
@example
@group
#ifdef NEW
-@var{version from A buffer}
-#else /* not NEW */
@var{version from B buffer}
+#else /* not NEW */
+@var{version from A buffer}
#endif /* not NEW */
@end group
@end example
alternative versions, you can specify the strings to use by setting
the variable @code{emerge-combine-versions-template} to a string of your
choice. In the string, @samp{%a} says where to put version A, and
-@samp{%b} says where to put version B. The default setting, which
+@samp{%b} says where to put version B@. The default setting, which
produces the results shown above, looks like this:
@example
@group
-"#ifdef NEW\n%a#else /* not NEW */\n%b#endif /* not NEW */\n"
+"#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
@end group
@end example
@ifnottex
@xref{Hooks}.
@end ifnottex
-
-@ignore
- arch-tag: cda63f09-9c5f-4ea1-adb9-4a820fdfb24e
-@end ignore