summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-04-19 10:45:35 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-04-19 10:45:35 +0000
commit75055f943eb50da277a39e7f5a708f915d86db58 (patch)
tree3377662a75c0396268ef00380a8ca1edb99956c8 /usr.bin
parent0745e8ef60d61382d6e5c69ccaf4d54c9fa62723 (diff)
- flesh out the description of rcsdiff
- simplify synopsis whilst here ok xsa
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rcs/rcsdiff.129
1 files changed, 24 insertions, 5 deletions
diff --git a/usr.bin/rcs/rcsdiff.1 b/usr.bin/rcs/rcsdiff.1
index e58644b76d2..8ad04acab60 100644
--- a/usr.bin/rcs/rcsdiff.1
+++ b/usr.bin/rcs/rcsdiff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcsdiff.1,v 1.17 2006/03/06 14:41:04 jmc Exp $
+.\" $OpenBSD: rcsdiff.1,v 1.18 2006/04/19 10:45:34 jmc Exp $
.\"
.\" Copyright (c) 2005 Joris Vink <joris@openbsd.org>
.\" All rights reserved.
@@ -22,7 +22,6 @@
.Nd compare RCS revisions
.Sh SYNOPSIS
.Nm
-.Bk -words
.Op Fl cnquV
.Op Fl k Ns Ar mode
.Oo
@@ -31,12 +30,32 @@
.Oc
.Op Fl x Ns Ar suffixes
.Op Fl z Ns Ar tz
-.Ar file ...
-.Ek
+.Ar
.Sh DESCRIPTION
The
.Nm
-program is used to compare two revisions of each RCS file given.
+program is used to compare revisions of RCS files,
+in much the same way as the
+.Xr diff 1
+utility.
+Differences between two specific revisions can be requested,
+as well as differences between the current working file and
+the latest revision of the default branch.
+.Pp
+It is not possible to display differences between entire directories,
+or differences between more than two files.
+All diffs produced are in the standard diff format,
+unless the
+.Fl u
+option is specified,
+which produces unified diffs.
+.Pp
+.Nm
+also supports
+keyword substitution \(en
+see the
+.Xr cvs 1
+man page for more information.
.Pp
The following options are supported:
.Bl -tag -width Ds