diff options
| -rw-r--r-- | usr.bin/diff/diff.1 | 18 | ||||
| -rw-r--r-- | usr.bin/diff/diff.c | 16 |
2 files changed, 17 insertions, 17 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 diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 90517fc1847..134f2e81ec0 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.55 2009/11/09 13:34:59 sobrado Exp $ */ +/* $OpenBSD: diff.c,v 1.56 2010/02/21 15:24:01 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] [-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] [-c | -e | -f | -n | -u] [-I pattern] [-L label]\n" - " [-S name] [-X file] [-x pattern] dir1 dir2\n"); + "usage: diff [-abdilpTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]\n" + " file1 file2\n" + " diff [-abdilpTtw] [-I pattern] [-L label] -C number file1 file2\n" + " diff [-abdiltw] [-I pattern] -D string file1 file2\n" + " diff [-abdilpTtw] [-I pattern] [-L label] -U number file1 file2\n" + " diff [-abdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]\n" + " [-L label] [-S name] [-X file] [-x pattern] dir1 dir2\n"); exit(2); } |