summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
diff options
context:
space:
mode:
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 337fce71af3..d9fc9080790 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.42 2006/05/09 12:33:42 ray Exp $ */
+/* $OpenBSD: rcsmerge.c,v 1.43 2006/05/09 14:03:55 jmc Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -184,6 +184,6 @@ void
rcsmerge_usage(void)
{
fprintf(stderr,
- "usage: rcsmerge [-EeV] [-kmode] [-p[rev]] [-q[rev]]\n"
+ "usage: rcsmerge [-EV] [-kmode] [-p[rev]] [-q[rev]]\n"
" [-xsuffixes] [-ztz] -rrev file ...\n");
}