diff options
| author |   sobrado <sobrado@openbsd.org> | 2010-02-21 15:24:01 +0000 |
|---|---|---|
| committer | sobrado <sobrado@openbsd.org> | 2010-02-21 15:24:01 +0000 |
| commit | 9d40d95c68894af654289014f961b0465035b4bb (patch) | |
| tree | ed777ef91ae92dcdaa82aea326a696752b3aacff /usr.bin/diff/diff.1 | |
| parent | Make sure we only request our peer to start processing descriptors if it (diff) | |
| download | wireguard-openbsd-9d40d95c68894af654289014f961b0465035b4bb.tar.xz wireguard-openbsd-9d40d95c68894af654289014f961b0465035b4bb.zip | |
`-q' is an output option, hence it is mutually exclusive.
ok jmc@
Diffstat (limited to 'usr.bin/diff/diff.1')
| -rw-r--r-- | usr.bin/diff/diff.1 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 2e6f392fad3..f76ded66af8 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: diff.1,v 1.36 2009/11/09 13:34:59 sobrado Exp $ +.\" $OpenBSD: diff.1,v 1.37 2010/02/21 15:24:01 sobrado Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" -.Dd $Mdocdate: November 9 2009 $ +.Dd $Mdocdate: February 21 2010 $ .Dt DIFF 1 .Os .Sh NAME @@ -37,36 +37,36 @@ .Nd differential file and directory comparator .Sh SYNOPSIS .Nm diff -.Op Fl abdilpqTtw +.Op Fl abdilpTtw .Oo .Fl c | e | f | -.Fl n | u +.Fl n | q | u .Oc .Op Fl I Ar pattern .Op Fl L Ar label .Ar file1 file2 .Nm diff -.Op Fl abdilpqTtw +.Op Fl abdilpTtw .Op Fl I Ar pattern .Op Fl L Ar label .Fl C Ar number .Ar file1 file2 .Nm diff -.Op Fl abdilqtw +.Op Fl abdiltw .Op Fl I Ar pattern .Fl D Ar string .Ar file1 file2 .Nm diff -.Op Fl abdilpqTtw +.Op Fl abdilpTtw .Op Fl I Ar pattern .Op Fl L Ar label .Fl U Ar number .Ar file1 file2 .Nm diff -.Op Fl abdilNPpqrsTtw +.Op Fl abdilNPprsTtw .Oo .Fl c | e | f | -.Fl n | u +.Fl n | q | u .Oc .Op Fl I Ar pattern .Bk -words |