summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-09-22 13:42:44 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-09-22 13:42:44 +0000
commit624b47dffe6c9cd4db4cdde78856885bd26bc9b7 (patch)
tree7ffc5f59e8e0a0afe1a88f3c61e4a17c4b3196f5
parent336a4b63252b742e0d70eeaf8f1a39ee372be9c5 (diff)
- explain diff_options (which i renamed from "diff options")
- sync usage() ok xsa
-rw-r--r--usr.bin/rcs/rcsdiff.18
-rw-r--r--usr.bin/rcs/rcsdiff.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/rcs/rcsdiff.1 b/usr.bin/rcs/rcsdiff.1
index 3e99a5f2036..49a27667e95 100644
--- a/usr.bin/rcs/rcsdiff.1
+++ b/usr.bin/rcs/rcsdiff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcsdiff.1,v 1.24 2006/09/21 16:29:03 jmc Exp $
+.\" $OpenBSD: rcsdiff.1,v 1.25 2006/09/22 13:42:43 jmc Exp $
.\"
.\" Copyright (c) 2005 Joris Vink <joris@openbsd.org>
.\" All rights reserved.
@@ -27,7 +27,7 @@
.Op Fl r Ns Ar rev
.Op Fl x Ns Ar suffixes
.Op Fl z Ns Ar tz
-.Op Ar diff options
+.Op Ar diff_options
.Ar
.Sh DESCRIPTION
The
@@ -90,6 +90,10 @@ Suffixes should be separated by the
character.
.It Fl z Ns Ar tz
Specify the date output format.
+.It Ar diff_options
+Any of the options documented in
+.Xr diff 1
+may also be specified.
.El
.Sh ENVIRONMENT
.Bl -tag -width RCSINIT
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index c29498fcff9..24433d5edee 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsdiff.c,v 1.69 2006/09/21 15:30:07 millert Exp $ */
+/* $OpenBSD: rcsdiff.c,v 1.70 2006/09/22 13:42:43 jmc Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -264,7 +264,7 @@ rcsdiff_usage(void)
{
fprintf(stderr,
"usage: rcsdiff [-cnquV] [-kmode] [-rrev] "
- "[-xsuffixes] [-ztz] file ...\n");
+ "[-xsuffixes] [-ztz] [diff_options] file ...\n");
}
static int