diff options
-rw-r--r-- | man/maintaining.texi | 7 |
1 files changed, 7 insertions, 0 deletions
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 |