[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.13 and 1.14

version 1.13, 2003/07/06 22:17:21 version 1.14, 2003/07/09 00:07:44
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 abiqtw  .Op Fl abilqtw
 .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 abiqtw  .Op Fl abilqtw
 .Op Fl C Ar number  .Op Fl C Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abiqtw  .Op Fl abilqtw
 .Op Fl D Ar string  .Op Fl D Ar string
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abiqtw  .Op Fl abilqtw
 .Op Fl U Ar number  .Op Fl U Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abiNqtw  .Op Fl abilNqtw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
Line 178 
Line 178 
 .It Fl b  .It Fl b
 Causes trailing blanks (spaces and tabs) to be ignored, and other  Causes trailing blanks (spaces and tabs) to be ignored, and other
 strings of blanks to compare equal.  strings of blanks to compare equal.
   .It Fl l
   Long output format; each text file
   .Nm diff Ns \'d
   is piped through
   .Xr pr 1
   to paginate it;
   other differences are remembered and summarized
   after all text file differences are reported.
 .It Fl i  .It Fl i
 Ignores the case of letters.  Ignores the case of letters.
 E.g.,  E.g.,
Line 413 
Line 421 
 .Xr comm 1 ,  .Xr comm 1 ,
 .Xr diff3 1 ,  .Xr diff3 1 ,
 .Xr ed 1 ,  .Xr ed 1 ,
   .Xr pr 1 ,
 .Xr fnmatch 3  .Xr fnmatch 3
 .Sh HISTORY  .Sh HISTORY
 A  A
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14