summaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.c
diff options
context:
space:
mode:
authorIgor Sobrado <sobrado@cvs.openbsd.org>2009-11-09 13:35:00 +0000
committerIgor Sobrado <sobrado@cvs.openbsd.org>2009-11-09 13:35:00 +0000
commit966a9e8bedc446f820332e587a4175ba5c8f8e23 (patch)
tree39ff89c1f9ce2b718b2f27bd0cd65f116decb0ea /usr.bin/diff/diff.c
parente0049fd6e29f167bada1d9a345425f36bbed9bff (diff)
move mutually exclusive options (-c, -e, -f, -n and -u) to the right place.
ok jmc@
Diffstat (limited to 'usr.bin/diff/diff.c')
-rw-r--r--usr.bin/diff/diff.c10
1 files changed, 5 insertions, 5 deletions
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);
}