/[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.10 by rms, Wed Nov 7 04:27:19 2001 UTC revision 1.11 by schwab, Fri Dec 7 11:57:15 2001 UTC
# Line 848  It's not unusual for programmers to get Line 848  It's not unusual for programmers to get
848  the same program in two different directions.  To recover from this  the same program in two different directions.  To recover from this
849  confusion, you need to merge the two versions.  Emerge makes this  confusion, you need to merge the two versions.  Emerge makes this
850  easier.  See also @ref{Comparing Files}, for commands to compare  easier.  See also @ref{Comparing Files}, for commands to compare
851  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}.
852    
853  @menu  @menu
854  * Overview of Emerge::  How to start Emerge.  Basic concepts.  * Overview of Emerge::  How to start Emerge.  Basic concepts.

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

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