# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1146920320 0
# Node ID 4b75ae0fccd3ba3e3be27aea078efbe24a720b8a
# Parent  170d8c260430351a8e20d14692e9328e149d45b2
(Maintaining) [ifnottex]: Add menu entry for "Emerge".
(List Tags) [ifnottex]: @include emerge-xtra.texi.

diff -r 170d8c260430 -r 4b75ae0fccd3 man/maintaining.texi
--- a/man/maintaining.texi	Sat May 06 12:58:11 2006 +0000
+++ b/man/maintaining.texi	Sat May 06 12:58:40 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