/[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.23 by kifer, Sun Feb 10 06:46:12 2002 UTC revision 1.24 by kifer, Tue Mar 5 05:37:09 2002 UTC
# Line 899  child Ediff session for comparing curren Line 899  child Ediff session for comparing curren
899  C as follows:  C as follows:
900    
901  @emph{If you are comparing 2 files or buffers:}  @emph{If you are comparing 2 files or buffers:}
902  Ediff would compare current Emacs regions in buffers A and B.  Ediff will ask you to select regions in buffers A and B.
903    
904  @emph{If you are comparing 3 files or buffers simultaneously:} Ediff would  @emph{If you are comparing 3 files or buffers simultaneously:} Ediff will
905  compare the current Emacs regions in the buffers of your choice (you will  ask you to choose buffers and then select regions inside those buffers.
 be asked which two of the three buffers to use).  
906    
907  @emph{If you are merging files or buffers (with or without ancestor):}  @emph{If you are merging files or buffers (with or without ancestor):}
908  Ediff would take the current region in the merge buffer and compare  Ediff will ask you to choose which buffer (A or B) to compare with the
909  it to the current region in the buffer of your choice (A or B).  merge buffer and then select regions in those buffers.
   
 @emph{Note: In all these cases you must first switch to the appropriate  
 Emacs buffers and manually set the regions that you want to compare.}  
   
 Highlighting set by the parent Ediff session is removed, to avoid interference  
 with highlighting of the child session.  When done with the child session, type  
 @kbd{C-l} in the parent's control panel to restore the original highlighting.  
   
 If you temporarily switch to the parent session, parent highlighting will be  
 restored.  If you then come back to the child session, you may want to remove  
 parent highlighting, so it won't interfere.  Typing @kbd{h} may help here.  
910    
911  @end table  @end table
912    
# Line 1050  memorize them. Line 1038  memorize them.
1038    
1039  In directory comparison or merging, a session group panel displays only the  In directory comparison or merging, a session group panel displays only the
1040  files common to all directories involved.  The differences are kept in a  files common to all directories involved.  The differences are kept in a
1041  separate buffer and are conveniently displayed by typing @kbd{D} to the  separate @emph{directory difference buffer} and are conveniently displayed
1042  corresponding session group panel.  Thus, as an added benefit, Ediff can be  by typing @kbd{D} to the corresponding session group panel.  Thus, as an
1043  used to compare the contents of up to three directories.  added benefit, Ediff can be used to compare the contents of up to three
1044    directories.
1045    
1046    @cindex Directory difference buffer
1047    Sometimes it is desirable to copy some files from one directory to another
1048    without exiting Ediff. The @emph{directory difference buffer}, which is
1049    displayed by typing @kbd{D} as discussed above, can be used for this
1050    purpose. If a file is, say, in Ediff's Directory A, but is missing in
1051    Ediff's Directory B (Ediff will refuse to override existing files), then
1052    typing @kbd{C} or clicking mouse button 2 over that file (which must be
1053    displayed in directory difference buffer) will copy that file from
1054    Directory A to Directory B.
1055    
1056  Session records in session group panels are also marked with @kbd{+}, for  Session records in session group panels are also marked with @kbd{+}, for
1057  active sessions, and with @kbd{-}, for finished sessions.  active sessions, and with @kbd{-}, for finished sessions.
# Line 2440  iro.umontreal.c Line 2439  iro.umontreal.c
2439  Tibor Polgar (tlp00@@spg.amdahl.com),  Tibor Polgar (tlp00@@spg.amdahl.com),
2440  David Prince (dave0d@@fegs.co.uk),  David Prince (dave0d@@fegs.co.uk),
2441  Paul Raines (raines@@slac.stanford.edu),  Paul Raines (raines@@slac.stanford.edu),
2442    Stefan Reicher (xsteve@@riic.at),
2443  Bill Richter (richter@@math.nwu.edu),  Bill Richter (richter@@math.nwu.edu),
2444  C.S.@: Roberson (roberson@@aur.alcatel.com),  C.S.@: Roberson (roberson@@aur.alcatel.com),
2445  Kevin Rodgers (kevin.rodgers@@ihs.com),  Kevin Rodgers (kevin.rodgers@@ihs.com),

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24

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