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

Diff for /src/usr.bin/diff/diff.1 between version 1.12 and 1.13

version 1.12, 2003/07/06 22:02:36 version 1.13, 2003/07/06 22:17:21
Line 37 
Line 37 
 .Nd differential file and directory comparator  .Nd differential file and directory comparator
 .Sh SYNOPSIS  .Sh SYNOPSIS
 .Nm diff  .Nm diff
 .Op Fl abitw  .Op Fl abiqtw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
 .Oc  .Oc
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abitw  .Op Fl abiqtw
 .Op Fl C Ar number  .Op Fl C Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abitw  .Op Fl abiqtw
 .Op Fl D Ar string  .Op Fl D Ar string
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abitw  .Op Fl abiqtw
 .Op Fl U Ar number  .Op Fl U Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abiNtw  .Op Fl abiNqtw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
Line 129 
Line 129 
 insert or delete command.  insert or delete command.
 This is the form used by  This is the form used by
 .Xr rcsdiff 1 .  .Xr rcsdiff 1 .
   .It Fl q
   Just print a line when the files differ.
   Does not output a list of changes.
 .It Fl u  .It Fl u
 Produces a  Produces a
 .Em unified  .Em unified
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13