diff options
| author |   millert <millert@openbsd.org> | 2003-07-09 00:07:44 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-07-09 00:07:44 +0000 |
| commit | b4bca33fcd90e52689100cb9afe3534ba75f7b3f (patch) | |
| tree | a8ef442047ed152327bead66fbfd38ce91435794 /usr.bin/diff/diff.1 | |
| parent | The best read code of mice and men, ... (reviewed by /dev/null) (diff) | |
| download | wireguard-openbsd-b4bca33fcd90e52689100cb9afe3534ba75f7b3f.tar.xz wireguard-openbsd-b4bca33fcd90e52689100cb9afe3534ba75f7b3f.zip | |
Re-implement -l flag; diff -l now works correctly in non-directory
mode (like GNU diff).
Diffstat (limited to 'usr.bin/diff/diff.1')
| -rw-r--r-- | usr.bin/diff/diff.1 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index feb5d67efb1..0959cd040f9 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: diff.1,v 1.13 2003/07/06 22:17:21 millert Exp $ +.\" $OpenBSD: diff.1,v 1.14 2003/07/09 00:07:44 millert Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -37,26 +37,26 @@ .Nd differential file and directory comparator .Sh SYNOPSIS .Nm diff -.Op Fl abiqtw +.Op Fl abilqtw .Oo .Fl c | Fl e | Fl f | .Fl n | Fl u .Oc .Ar file1 file2 .Nm diff -.Op Fl abiqtw +.Op Fl abilqtw .Op Fl C Ar number .Ar file1 file2 .Nm diff -.Op Fl abiqtw +.Op Fl abilqtw .Op Fl D Ar string .Ar file1 file2 .Nm diff -.Op Fl abiqtw +.Op Fl abilqtw .Op Fl U Ar number .Ar file1 file2 .Nm diff -.Op Fl abiNqtw +.Op Fl abilNqtw .Oo .Fl c | Fl e | Fl f | .Fl n | Fl u @@ -178,6 +178,14 @@ Treat all files as ASCII. .It Fl b Causes trailing blanks (spaces and tabs) to be ignored, and other 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 Ignores the case of letters. E.g., @@ -413,6 +421,7 @@ An error occurred. .Xr comm 1 , .Xr diff3 1 , .Xr ed 1 , +.Xr pr 1 , .Xr fnmatch 3 .Sh HISTORY A |