summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.1
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/rcs/rcsmerge.1')
-rw-r--r--usr.bin/rcs/rcsmerge.110
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1
index 741f361b809..2d781cc98a2 100644
--- a/usr.bin/rcs/rcsmerge.1
+++ b/usr.bin/rcs/rcsmerge.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcsmerge.1,v 1.9 2006/04/24 22:06:49 jmc Exp $
+.\" $OpenBSD: rcsmerge.1,v 1.10 2006/04/27 09:58:12 jmc Exp $
.\"
.\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
.\" All rights reserved.
@@ -36,14 +36,6 @@ The
program merges changes between two revisions of an RCS file into
the corresponding working file.
.Pp
-Files may be selected by revision or,
-where no revision is specified,
-the latest revision of the default branch is used.
-Revisions are specified either by using the
-.Fl r
-option or
-by appending the revision number to any option that supports it.
-.Pp
.Nm
also supports
keyword substitution \(en