diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2006-05-06 12:58:40 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2006-05-06 12:58:40 +0000 |
| commit | f192f501709eba18dcdb6b683295f84b3b13bd2c (patch) | |
| tree | 1e24511a472440e9c14f0ea86b6e2ffb36d5de77 | |
| parent | 4d28fae8a235bba2ed5f90983272d8492d3a0eca (diff) | |
| download | emacs-f192f501709eba18dcdb6b683295f84b3b13bd2c.tar.gz | |
(Maintaining) [ifnottex]: Add menu entry for "Emerge".
(List Tags) [ifnottex]: @include emerge-xtra.texi.
| -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 |