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

Diff of /emacs/man/ediff.texi

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

revision 1.26 by kifer, Tue Apr 16 05:49:11 2002 UTC revision 1.26.2.1 by miles, Fri Apr 4 06:20:47 2003 UTC
# Line 15  Line 15 
15  @synindex pg cp  @synindex pg cp
16  @synindex ky cp  @synindex ky cp
17    
 @dircategory Emacs  
 @direntry  
 * Ediff: (ediff).       A visual interface for comparing and merging programs.  
 @end direntry  
   
18  @iftex  @iftex
19  @finalout  @finalout
20  @end iftex  @end iftex
21  @c      @smallbook  @c      @smallbook
22  @comment %**end of header (This is for running Texinfo on a region.)  @comment %**end of header (This is for running Texinfo on a region.)
23    
24  @ifinfo  @copying
25  This file documents Ediff, a comprehensive visual interface to Unix diff  This file documents Ediff, a comprehensive visual interface to Unix diff
26  and patch utilities.  and patch utilities.
27    
28  Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.  Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
29    Foundation, Inc.
30    
31    @quotation
32  Permission is granted to copy, distribute and/or modify this document  Permission is granted to copy, distribute and/or modify this document
33  under the terms of the GNU Free Documentation License, Version 1.1 or  under the terms of the GNU Free Documentation License, Version 1.1 or
34  any later version published by the Free Software Foundation; with no  any later version published by the Free Software Foundation; with no
# Line 48  This document is part of a collection di Line 45  This document is part of a collection di
45  Documentation License.  If you want to distribute this document  Documentation License.  If you want to distribute this document
46  separately from the collection, you can do so by adding a copy of the  separately from the collection, you can do so by adding a copy of the
47  license to the document, as described in section 6 of the license.  license to the document, as described in section 6 of the license.
48  @end ifinfo  @end quotation
49    @end copying
50    
51    @dircategory Emacs
52    @direntry
53    * Ediff: (ediff).       A visual interface for comparing and merging programs.
54    @end direntry
55    
 @iftex  
56  @titlepage  @titlepage
57  @title Ediff User's Manual  @title Ediff User's Manual
58  @sp 4  @sp 4
# Line 62  license to the document, as described in Line 64  license to the document, as described in
64  @page  @page
65    
66  @vskip 0pt plus 1filll  @vskip 0pt plus 1filll
67  @noindent  @insertcopying
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.  
   
 Permission is granted to copy, distribute and/or modify this document  
 under the terms of the GNU Free Documentation License, Version 1.1 or  
 any later version published by the Free Software Foundation; with no  
 Invariant Sections, with the Front-Cover texts being ``A GNU  
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the  
 license is included in the section entitled ``GNU Free Documentation  
 License'' in the Emacs manual.  
   
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify  
 this GNU Manual, like GNU software.  Copies published by the Free  
 Software Foundation raise funds for GNU development.''  
   
 This document is part of a collection distributed under the GNU Free  
 Documentation License.  If you want to distribute this document  
 separately from the collection, you can do so by adding a copy of the  
 license to the document, as described in section 6 of the license.  
68  @end titlepage  @end titlepage
69  @page  
 @end iftex  
70    
71  @node Top, Introduction, (dir), (dir)  @node Top, Introduction, (dir), (dir)
72    
# Line 262  utility to change the original files on Line 245  utility to change the original files on
245  dangerous, since you will always have the original contents of the file  dangerous, since you will always have the original contents of the file
246  saved in another file that has the extension @file{.orig}.  saved in another file that has the extension @file{.orig}.
247  Furthermore, if the file is under version control, then you can always back  Furthermore, if the file is under version control, then you can always back
248  out to one of the previous versions (see the section on Version Countrol in  out to one of the previous versions (see the section on Version Control in
249  Emacs manual).  the Emacs manual).
250    
251  @code{ediff-patch-file} is careful about versions control: if the file  @code{ediff-patch-file} is careful about versions control: if the file
252  to be patched is checked in, then Ediff will offer to check it out, because  to be patched is checked in, then Ediff will offer to check it out, because
# Line 897  reduce the risk of developing a cataract Line 880  reduce the risk of developing a cataract
880  In other situations, the currently highlighted region might be big and you  In other situations, the currently highlighted region might be big and you
881  might want to reconcile of them interactively.  might want to reconcile of them interactively.
882    
883  All of this can be done with the above comand, @kbd{=}, which  All of this can be done with the above command, @kbd{=}, which
884  compares regions within Ediff buffers.  Typing @kbd{=} creates a  compares regions within Ediff buffers.  Typing @kbd{=} creates a
885  child Ediff session for comparing regions in buffers A, B, or  child Ediff session for comparing regions in buffers A, B, or
886  C as follows.  C as follows.
# Line 2451  spg.amdahl.com), Line 2434  spg.amdahl.com),
2434  David Prince (dave0d@@fegs.co.uk),  David Prince (dave0d@@fegs.co.uk),
2435  Paul Raines (raines@@slac.stanford.edu),  Paul Raines (raines@@slac.stanford.edu),
2436  Stefan Reicher (xsteve@@riic.at),  Stefan Reicher (xsteve@@riic.at),
2437    Charles Rich (rich@@merl.com),
2438  Bill Richter (richter@@math.nwu.edu),  Bill Richter (richter@@math.nwu.edu),
2439  C.S.@: Roberson (roberson@@aur.alcatel.com),  C.S.@: Roberson (roberson@@aur.alcatel.com),
2440  Kevin Rodgers (kevin.rodgers@@ihs.com),  Kevin Rodgers (kevin.rodgers@@ihs.com),

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.26.2.1

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