aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-05-06 12:58:40 +0000
committerEli Zaretskii2006-05-06 12:58:40 +0000
commit4984edc7c449d68ad08785bbdc6a01675aeca6e7 (patch)
tree7d5968ad02a0200d9186bae9595d8c1a1f159a05
parent0701f901259b17408360b08134af0ef2657984c8 (diff)
downloademacs-4984edc7c449d68ad08785bbdc6a01675aeca6e7.tar.gz
emacs-4984edc7c449d68ad08785bbdc6a01675aeca6e7.zip
(Maintaining) [ifnottex]: Add menu entry for "Emerge".
(List Tags) [ifnottex]: @include emerge-xtra.texi.
-rw-r--r--man/maintaining.texi7
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.
14* Format of ChangeLog:: What the change log file looks like. 14* Format of ChangeLog:: What the change log file looks like.
15* Tags:: Go direct to any function in your program in one 15* Tags:: Go direct to any function in your program in one
16 command. Tags remembers which file it is in. 16 command. Tags remembers which file it is in.
17@ifnottex
18* Emerge:: A convenient way of merging two versions of a program.
19@end ifnottex
17@end menu 20@end menu
18 21
19@node Change Log 22@node Change Log
@@ -845,6 +848,10 @@ details.
845 You can also use the collection of tag names to complete a symbol 848 You can also use the collection of tag names to complete a symbol
846name in the buffer. @xref{Symbol Completion}. 849name in the buffer. @xref{Symbol Completion}.
847 850
851@ifnottex
852@include emerge-xtra.texi
853@end ifnottex
854
848@ignore 855@ignore
849 arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb 856 arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
850@end ignore 857@end ignore