summaryrefslogtreecommitdiff
path: root/usr.bin/rcs
diff options
context:
space:
mode:
authorIgor Sobrado <sobrado@cvs.openbsd.org>2007-04-26 21:49:34 +0000
committerIgor Sobrado <sobrado@cvs.openbsd.org>2007-04-26 21:49:34 +0000
commite2848169e18074657b957e74f40e905183545df0 (patch)
treefcb363ff4fe04708a1303b9793ea6d77bbdb1e58 /usr.bin/rcs
parent53b79e76fe1d07298dfa5fbd728d7d015ce7e59c (diff)
compatibility (`do nothing') options do not need to be announced
in the synopsis/usage(); we do not want `[-L label]' three times ok by jmc@, niallo@, and xsa@
Diffstat (limited to 'usr.bin/rcs')
-rw-r--r--usr.bin/rcs/merge.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/rcs/merge.c b/usr.bin/rcs/merge.c
index 19c99dde691..2aad5a25d9d 100644
--- a/usr.bin/rcs/merge.c
+++ b/usr.bin/rcs/merge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: merge.c,v 1.5 2007/02/27 07:59:13 xsa Exp $ */
+/* $OpenBSD: merge.c,v 1.6 2007/04/26 21:49:33 sobrado Exp $ */
/*
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -117,6 +117,5 @@ void
merge_usage(void)
{
(void)fprintf(stderr,
- "usage: merge [-AeEpqV] [-L lab [-L lab [-L lab]]] "
- "file1 file2 file3\n");
+ "usage: merge [-EepqV] [-L label] file1 file2 file3\n");
}