=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.1,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- src/usr.bin/rcs/rcsmerge.1 2006/04/19 11:16:14 1.6 +++ src/usr.bin/rcs/rcsmerge.1 2006/04/24 08:18:06 1.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.6 2006/04/19 11:16:14 jmc Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.7 2006/04/24 08:18:06 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria .\" All rights reserved. @@ -26,9 +26,9 @@ .Op Fl k Ns Ar mode .Op Fl p Ns Op Ar rev .Op Fl q Ns Op Ar rev -.Op Fl r Ns Ar rev .Op Fl x Ns Ar suffixes .Op Fl z Ns Ar tz +.Fl r Ns Ar rev .Ar .Sh DESCRIPTION The @@ -67,6 +67,11 @@ .It Fl r Ns Ar rev Merge with respect to revision .Ar rev . +This option should be specified twice to merge changes +between two specific revisions. +If only one revision is specified, +merging is done between that revision and +the latest revision of the default branch. .It Fl V Print RCS's version number. .It Fl x Ns Ar suffixes