[BACK]Return to diff3.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / diff3

Diff for /src/usr.bin/diff3/diff3.1 between version 1.5 and 1.6

version 1.5, 2005/12/27 12:48:56 version 1.6, 2006/02/22 22:35:11
Line 37 
Line 37 
 .Nd 3-way differential file comparison  .Nd 3-way differential file comparison
 .Sh SYNOPSIS  .Sh SYNOPSIS
 .Nm diff3  .Nm diff3
 .Op Fl aexEX3  .Op Fl 3aEeXx
 .Ar file1 file2 file3  .Ar file1 file2 file3
 .Sh DESCRIPTION  .Sh DESCRIPTION
 The  The
Line 59 
Line 59 
 .Pp  .Pp
 The options are as follows:  The options are as follows:
 .Bl -tag -width "-E, -X"  .Bl -tag -width "-E, -X"
   .It Fl 3
   Produces an output script suitable for
   .Xr ed 1
   with changes
   specific only to
   .Ar file3 .
 .It Fl a  .It Fl a
 Treat all files as ASCII.  Treat all files as ASCII.
   .It Fl E , X
   Similar to
   .Fl e
   and
   .Fl x ,
   respectively, but treat overlapping changes (i.e., changes that would
   be noted with ==== in the normal listing) differently.
   The overlapping lines from both files will be inserted by the edit script,
   bracketed by "<<<<<<" and ">>>>>>" lines.
 .It Fl e  .It Fl e
 Produces output in a form suitable as an input script for the  Produces output in a form suitable as an input script for the
 .Xr ed 1  .Xr ed 1
Line 88 
Line 103 
 .Xr ed 1  .Xr ed 1
 with changes  with changes
 specific only to all three versions.  specific only to all three versions.
 .It Fl 3  
 Produces an output script suitable for  
 .Xr ed 1  
 with changes  
 specific only to  
 .Ar file3 .  
 .It Fl E , X  
 Similar to  
 .Fl e  
 and  
 .Fl x ,  
 respectively, but treat overlapping changes (i.e., changes that would  
 be noted with ==== in the normal listing) differently.  
 The overlapping lines from both files will be inserted by the edit script,  
 bracketed by "<<<<<<" and ">>>>>>" lines.  
 .El  .El
 .Pp  .Pp
 The  The
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6