summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-04-24 08:18:07 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-04-24 08:18:07 +0000
commitde2a400e5869c34f76c246c17f4b1ff4bc1bbe27 (patch)
tree0c76323be861d97fddb2f0ef251aa0afc2f388d1 /usr.bin/rcs/rcsmerge.c
parent63146d6e0e281dbe95f36d00f6b9d45e4754e37c (diff)
-r is not optional: simplify its synopsis, but improve its description;
ok xsa
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
-rw-r--r--usr.bin/rcs/rcsmerge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index 75030374038..ba4d92ef71e 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.31 2006/04/24 08:10:41 xsa Exp $ */
+/* $OpenBSD: rcsmerge.c,v 1.32 2006/04/24 08:18:06 jmc Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -176,5 +176,5 @@ rcsmerge_usage(void)
{
fprintf(stderr,
"usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]]\n"
- " [-rrev] [-xsuffixes] [-ztz] file ...\n");
+ " [-xsuffixes] [-ztz] -rrev file ...\n");
}