=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.1,v retrieving revision 1.9 retrieving revision 1.10 diff -c -r1.9 -r1.10 *** src/usr.bin/rcs/rcsmerge.1 2006/04/24 22:06:49 1.9 --- src/usr.bin/rcs/rcsmerge.1 2006/04/27 09:58:12 1.10 *************** *** 1,4 **** ! .\" $OpenBSD: rcsmerge.1,v 1.9 2006/04/24 22:06:49 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria .\" All rights reserved. --- 1,4 ---- ! .\" $OpenBSD: rcsmerge.1,v 1.10 2006/04/27 09:58:12 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria .\" All rights reserved. *************** *** 35,48 **** .Nm 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 --- 35,40 ----