diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2009-11-09 13:35:00 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2009-11-09 13:35:00 +0000 |
| commit | 966a9e8bedc446f820332e587a4175ba5c8f8e23 (patch) | |
| tree | 39ff89c1f9ce2b718b2f27bd0cd65f116decb0ea /usr.bin | |
| parent | e0049fd6e29f167bada1d9a345425f36bbed9bff (diff) | |
move mutually exclusive options (-c, -e, -f, -n and -u) to the right place.
ok jmc@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/diff/diff.1 | 8 | ||||
| -rw-r--r-- | usr.bin/diff/diff.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index af9f608a4a4..2e6f392fad3 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: diff.1,v 1.35 2009/02/08 17:33:01 jmc Exp $ +.\" $OpenBSD: diff.1,v 1.36 2009/11/09 13:34:59 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: February 8 2009 $ +.Dd $Mdocdate: November 9 2009 $ .Dt DIFF 1 .Os .Sh NAME @@ -38,11 +38,11 @@ .Sh SYNOPSIS .Nm diff .Op Fl abdilpqTtw -.Op Fl I Ar pattern .Oo .Fl c | e | f | .Fl n | u .Oc +.Op Fl I Ar pattern .Op Fl L Ar label .Ar file1 file2 .Nm diff @@ -64,11 +64,11 @@ .Ar file1 file2 .Nm diff .Op Fl abdilNPpqrsTtw -.Op Fl I Ar pattern .Oo .Fl c | e | f | .Fl n | u .Oc +.Op Fl I Ar pattern .Bk -words .Op Fl L Ar label .Op Fl S Ar name diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index d0fe473d117..90517fc1847 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.54 2009/10/27 23:59:37 deraadt Exp $ */ +/* $OpenBSD: diff.c,v 1.55 2009/11/09 13:34:59 sobrado Exp $ */ /* * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -401,13 +401,13 @@ __dead void usage(void) { (void)fprintf(stderr, - "usage: diff [-abdilpqTtw] [-I pattern] [-c | -e | -f | -n | -u]\n" - " [-L label] file1 file2\n" + "usage: diff [-abdilpqTtw] [-c | -e | -f | -n | -u] [-I pattern] [-L label] file1\n" + " file2\n" " diff [-abdilpqTtw] [-I pattern] [-L label] -C number file1 file2\n" " diff [-abdilqtw] [-I pattern] -D string file1 file2\n" " diff [-abdilpqTtw] [-I pattern] [-L label] -U number file1 file2\n" - " diff [-abdilNPpqrsTtw] [-I pattern] [-c | -e | -f | -n | -u]\n" - " [-L label] [-S name] [-X file] [-x pattern] dir1 dir2\n"); + " diff [-abdilNPpqrsTtw] [-c | -e | -f | -n | -u] [-I pattern] [-L label]\n" + " [-S name] [-X file] [-x pattern] dir1 dir2\n"); exit(2); } |