[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.15 and 1.16

version 1.15, 2003/07/21 23:18:21 version 1.16, 2003/07/22 01:16:01
Line 29 
Line 29 
 .\"  .\"
 .\"     @(#)diff.1      8.1 (Berkeley) 6/30/93  .\"     @(#)diff.1      8.1 (Berkeley) 6/30/93
 .\"  .\"
 .Dd June 25, 2003  .Dd July 21, 2003
 .Dt DIFF 1  .Dt DIFF 1
 .Os  .Os
 .Sh NAME  .Sh NAME
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 abilqtw  .Op Fl abilqtTw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
 .Oc  .Oc
   .Op Fl L Ar label
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abilqtw  .Op Fl abilqtTw
 .Op Fl C Ar number  .Op Fl L Ar label
   .Fl C Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abilqtw  .Op Fl abilqtw
 .Op Fl D Ar string  .Fl D Ar string
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abilqtw  .Op Fl abilqtTw
 .Op Fl U Ar number  .Op Fl L Ar label
   .Fl U Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abilNqtw  .Op Fl abilNqtTw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
 .Oc  .Oc
 .Bk -words  .Bk -words
   .Op Fl L Ar label
 .Op Fl r  .Op Fl r
 .Op Fl s  .Op Fl s
 .Op Fl S Ar name  .Op Fl S Ar name
Line 178 
Line 182 
 .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 i
   Ignores the case of letters.
   E.g.,
   .Dq A
   will compare equal to
   .Dq a .
 .It Fl l  .It Fl l
 Long output format; each text file  Long output format; each text file
 .Nm diff Ns \'d  .Nm diff Ns \'d
Line 186 
Line 196 
 to paginate it;  to paginate it;
 other differences are remembered and summarized  other differences are remembered and summarized
 after all text file differences are reported.  after all text file differences are reported.
 .It Fl i  .It Fl L Ar label
 Ignores the case of letters.  Print
 E.g.,  .Ar label
 .Dq A  instead of the first file name and time in the context or unified diff header.
 will compare equal to  
 .Dq a .  
 .It Fl t  .It Fl t
 Will expand tabs in output lines.  Will expand tabs in output lines.
 Normal or  Normal or
Line 200 
Line 208 
 the indentation of the original source lines and make the output listing  the indentation of the original source lines and make the output listing
 difficult to interpret.  difficult to interpret.
 This option will preserve the original source's indentation.  This option will preserve the original source's indentation.
   .It Fl T
   Print a tab rather than a space before the rest of the line for the
   normal, context or unified output formats.
   This makes the alignment of tabs in the line consistent.
 .It Fl w  .It Fl w
 Is similar to  Is similar to
 .Fl b  .Fl b
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16