[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/man/maintaining.texi
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/man/maintaining.texi |
Date: |
Fri, 07 Dec 2001 06:57:15 -0500 |
Index: emacs/man/maintaining.texi
diff -c emacs/man/maintaining.texi:1.10 emacs/man/maintaining.texi:1.11
*** emacs/man/maintaining.texi:1.10 Tue Nov 6 23:27:19 2001
--- emacs/man/maintaining.texi Fri Dec 7 06:57:15 2001
***************
*** 848,854 ****
the same program in two different directions. To recover from this
confusion, you need to merge the two versions. Emerge makes this
easier. See also @ref{Comparing Files}, for commands to compare
! in a more manual fashion, and @ref{,Ediff,, ediff, The Ediff Manual}.
@menu
* Overview of Emerge:: How to start Emerge. Basic concepts.
--- 848,854 ----
the same program in two different directions. To recover from this
confusion, you need to merge the two versions. Emerge makes this
easier. See also @ref{Comparing Files}, for commands to compare
! in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
@menu
* Overview of Emerge:: How to start Emerge. Basic concepts.
- [Emacs-diffs] Changes to emacs/man/maintaining.texi,
Andreas Schwab <=