From 9d40d95c68894af654289014f961b0465035b4bb Mon Sep 17 00:00:00 2001 From: sobrado Date: Sun, 21 Feb 2010 15:24:01 +0000 Subject: `-q' is an output option, hence it is mutually exclusive. ok jmc@ --- usr.bin/diff/diff.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'usr.bin/diff/diff.c') 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 @@ -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); } -- cgit v1.2.3-59-g8ed1b