/[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.20 by rms, Mon Aug 20 01:15:42 2001 UTC revision 1.21 by kifer, Mon Dec 24 05:50:31 2001 UTC
# Line 27  Line 27 
27  @comment %**end of header (This is for running Texinfo on a region.)  @comment %**end of header (This is for running Texinfo on a region.)
28    
29  @ifinfo  @ifinfo
30  This file documents Ediff, a comprehensive visual interface to diff  This file documents Ediff, a comprehensive visual interface to Unix diff
31  and patch utilities.  and patch utilities.
32    
33  Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.  Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
# Line 123  Furthermore, Ediff is equipped with dire Line 123  Furthermore, Ediff is equipped with dire
123  allow the user to conveniently launch browsing or merging sessions on  allow the user to conveniently launch browsing or merging sessions on
124  groups of files in two (or three) different directories.  groups of files in two (or three) different directories.
125    
126  In addition, Ediff can apply a patch to a file and then let you step though  In addition, Ediff can apply a patch to a file and then let you step through
127  both files, the patched and the original one, simultaneously,  both files, the patched and the original one, simultaneously,
128  difference-by-difference.  You can even apply a patch right out of a mail  difference-by-difference.  You can even apply a patch right out of a mail
129  buffer, i.e., patches received by mail don't even have to be saved.  Since  buffer, i.e., patches received by mail don't even have to be saved.  Since
# Line 1071  set on a per-buffer basis.  Therefore, u Line 1071  set on a per-buffer basis.  Therefore, u
1071  this variable globally.  this variable globally.
1072    
1073  @cindex Multi-file patches  @cindex Multi-file patches
1074  A multi-file patch is a concatenated output of several runs of the  A multi-file patch is a concatenated output of several runs of the Unix
1075  @code{diff} command (some versions of @code{diff} let you create a  @code{diff} command (some versions of @code{diff} let you create a
1076  multi-file patch in just one run).  Ediff facilitates creation of  multi-file patch in just one run).  Ediff facilitates creation of
1077  multi-file patches as follows.  If you are in a session group buffer  multi-file patches as follows.  If you are in a session group buffer
# Line 1821  format yet. Line 1821  format yet.
1821  @vindex ediff-coding-system-for-read  @vindex ediff-coding-system-for-read
1822  This variable specifies the coding system to use when reading the output  This variable specifies the coding system to use when reading the output
1823  that the programs @code{diff3} and @code{diff} send to Emacs. The default  that the programs @code{diff3} and @code{diff} send to Emacs. The default
1824  is @code{raw-text}, and this should work fine on GNU, Unix, and in most  is @code{raw-text}, and this should work fine in Unix and in most
1825  cases under Windows NT/95/98/2000.  There are @code{diff} programs  cases under Windows NT/95/98/2000. There are @code{diff} programs
1826  for which the default option doesn't work under Windows. In such cases,  for which the default option doesn't work under Windows. In such cases,
1827  @code{raw-text-dos} might work. If not, you will have to experiment with  @code{raw-text-dos} might work. If not, you will have to experiment with
1828  other coding systems or use GNU diff.  other coding systems or use GNU diff.

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

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