From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 6 May 2006 12:58:40 +0000 (+0000)
Subject: (Maintaining) [ifnottex]: Add menu entry for "Emerge".
X-Git-Tag: emacs-pretest-22.0.90~2747
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4984edc7c449d68ad08785bbdc6a01675aeca6e7;p=emacs.git

(Maintaining) [ifnottex]: Add menu entry for "Emerge".
(List Tags) [ifnottex]: @include emerge-xtra.texi.
---

diff --git a/man/maintaining.texi b/man/maintaining.texi
index f0b5f1c31af..1307ce6a229 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -14,6 +14,9 @@ also particularly useful for this purpose.
 * 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 @@ details.
   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