Mercurial > emacs

diff doc/emacs/emerge-xtra.texi @ 109262:51ddcf320fe4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Untabify doc/emacs/*.texi files. * abbrevs.texi, basic.texi, buffers.texi, building.texi, calendar.texi: * custom.texi, dired.texi, display.texi, emacs.texi, emerge-xtra.texi: * files.texi, fortran-xtra.texi, frames.texi, help.texi, killing.texi: * maintaining.texi, mark.texi, mini.texi, misc.texi, msdog.texi: * programs.texi, rmail.texi, screen.texi, search.texi, sending.texi: * text.texi, trouble.texi, vc1-xtra.texi, xresources.texi: Untabify Texinfo files.
author Glenn Morris <rgm@gnu.org>
date Tue, 22 Jun 2010 19:46:43 -0700
parents 1d1d5d9bd884
children 376148b31b5e
line wrap: on
line diff
--- a/doc/emacs/emerge-xtra.texi	Tue Jun 22 12:25:17 2010 -0700
+++ b/doc/emacs/emerge-xtra.texi	Tue Jun 22 19:46:43 2010 -0700
@@ -1,5 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   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
@@ -22,16 +23,16 @@
 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::   Miscellaneous issues.
+* 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