[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/man/maintaining.texi
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/man/maintaining.texi |
Date: |
Sat, 06 May 2006 12:58:40 +0000 |
Index: emacs/man/maintaining.texi
diff -u emacs/man/maintaining.texi:1.43 emacs/man/maintaining.texi:1.44
--- emacs/man/maintaining.texi:1.43 Thu Mar 16 03:19:56 2006
+++ emacs/man/maintaining.texi Sat May 6 12:58:40 2006
@@ -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.
address@hidden
+* Emerge:: A convenient way of merging two versions of a program.
address@hidden 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}.
address@hidden
address@hidden emerge-xtra.texi
address@hidden ifnottex
+
@ignore
arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
@end ignore
- [Emacs-diffs] Changes to emacs/man/maintaining.texi,
Eli Zaretskii <=