[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.22 and 1.23

version 1.22, 2003/09/18 09:38:33 version 1.23, 2004/01/07 17:19:05
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 abdilqtTw  .Op Fl abdilpqtTw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
Line 45 
Line 45 
 .Op Fl L Ar label  .Op Fl L Ar label
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abdilqtTw  .Op Fl abdilpqtTw
 .Op Fl L Ar label  .Op Fl L Ar label
 .Fl C Ar number  .Fl C Ar number
 .Ar file1 file2  .Ar file1 file2
Line 54 
Line 54 
 .Fl D Ar string  .Fl D Ar string
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abdilqtTw  .Op Fl abdilpqtTw
 .Op Fl L Ar label  .Op Fl L Ar label
 .Fl U Ar number  .Fl U Ar number
 .Ar file1 file2  .Ar file1 file2
 .Nm diff  .Nm diff
 .Op Fl abdilNPqtTw  .Op Fl abdilNPpqtTw
 .Oo  .Oo
 .Fl c | Fl e | Fl f |  .Fl c | Fl e | Fl f |
 .Fl n | Fl u  .Fl n | Fl u
Line 205 
Line 205 
 Print  Print
 .Ar label  .Ar label
 instead of the first file name and time in the context or unified diff header.  instead of the first file name and time in the context or unified diff header.
   .It Fl p
   With unified and context diffs, show with each change
   the first 40 characters of the last line before the context beginning
   with a letter, an underscore or a dollar sign.
   For C source code following standard layout conventions, this will
   show the prototype of the function the change applies to.
 .It Fl t  .It Fl t
 Will expand tabs in output lines.  Will expand tabs in output lines.
 Normal or  Normal or
Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23