diff man/maintaining.texi @ 90389:146cd8369025

Revision: [e-mail]/emacs--unicode--0--patch-60 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 259-273) - Update from CVS - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t - Merge from gnus--rel--5.10 - Rename "field-at-point" to "field-at-pos" - (comint-insert-input): Remove redundant calls to setq and goto-char * gnus--rel--5.10 (patch 99-100) - Merge from emacs--devo--0 - Update from CVS

--- a/man/maintaining.texi	Tue May 02 08:50:29 2006 +0000
+++ b/man/maintaining.texi	Wed May 10 20:42:41 2006 +0000
@@ -14,6 +14,9 @@
 * Format of ChangeLog:: What the change log file looks like.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
+@ifnottex
+* Emerge::              A convenient way of merging two versions of a program.
+@end ifnottex
 @end menu
 
 @node Change Log
@@ -845,6 +848,10 @@
   You can also use the collection of tag names to complete a symbol
 name in the buffer.  @xref{Symbol Completion}.
 
+@ifnottex
+@include emerge-xtra.texi
+@end ifnottex
+
 @ignore
    arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
 @end ignore