/[emacs]/emacs/man/maintaining.texi
ViewVC logotype

Diff of /emacs/man/maintaining.texi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.8.4.2 by rms, Wed Nov 7 04:28:33 2001 UTC revision 1.8.4.3 by eliz, Wed Mar 13 19:46:18 2002 UTC
# Line 851  It's not unusual for programmers to get Line 851  It's not unusual for programmers to get
851  the same program in two different directions.  To recover from this  the same program in two different directions.  To recover from this
852  confusion, you need to merge the two versions.  Emerge makes this  confusion, you need to merge the two versions.  Emerge makes this
853  easier.  See also @ref{Comparing Files}, for commands to compare  easier.  See also @ref{Comparing Files}, for commands to compare
854  in a more manual fashion, and @ref{,Ediff,, ediff, The Ediff Manual}.  in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
855    
856  @menu  @menu
857  * Overview of Emerge::  How to start Emerge.  Basic concepts.  * Overview of Emerge::  How to start Emerge.  Basic concepts.

Legend:
Removed from v.1.8.4.2  
changed lines
  Added in v.1.8.4.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26