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

Diff for /src/usr.bin/sdiff/sdiff.1 between version 1.10 and 1.11

version 1.10, 2006/12/20 15:32:10 version 1.11, 2007/02/22 02:50:56
Line 3 
Line 3 
 .\" Written by Raymond Lai <ray@cyth.net>.  .\" Written by Raymond Lai <ray@cyth.net>.
 .\" Public domain.  .\" Public domain.
 .\"  .\"
 .Dd October 29, 2005  .Dd February 21, 2007
 .Dt SDIFF 1  .Dt SDIFF 1
 .Os  .Os
 .Sh NAME  .Sh NAME
Line 18 
Line 18 
 .Ar file1  .Ar file1
 .Ar file2  .Ar file2
 .Sh DESCRIPTION  .Sh DESCRIPTION
 Shows a side-by-side comparison of two files.  .Nm
   displays two files side by side,
   with any differences between the two highlighted as follows:
   new lines are marked with
   .Sq \*(Gt ;
   deleted lines are marked with
   .Sq \*(Lt ;
   and changed lines are marked with
   .Sq \*(Ba .
   .Pp
   .Nm
   can also be used to interactively merge two files,
   prompting at each set of differences.
   See the
   .Fl o
   option for an explanation.
 .Pp  .Pp
 The options are:  The options are:
 .Bl -tag -width Ds  .Bl -tag -width Ds
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11