=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.1,v retrieving revision 1.4 retrieving revision 1.5 diff -c -r1.4 -r1.5 *** src/usr.bin/rcs/rcsmerge.1 2006/03/06 09:41:53 1.4 --- src/usr.bin/rcs/rcsmerge.1 2006/03/06 14:44:51 1.5 *************** *** 1,4 **** ! .\" $OpenBSD: rcsmerge.1,v 1.4 2006/03/06 09:41:53 deraadt Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria .\" All rights reserved. --- 1,4 ---- ! .\" $OpenBSD: rcsmerge.1,v 1.5 2006/03/06 14:44:51 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria .\" All rights reserved. *************** *** 23,29 **** .Sh SYNOPSIS .Nm .Bk -words ! .Op Fl AEeTV .Op Fl k Ns Ar mode .Op Fl p Ns Op Ar rev .Op Fl q Ns Op Ar rev --- 23,29 ---- .Sh SYNOPSIS .Nm .Bk -words ! .Op Fl AEeV .Op Fl k Ns Ar mode .Op Fl p Ns Op Ar rev .Op Fl q Ns Op Ar rev *************** *** 62,70 **** .It Fl r Ns Ar rev Merge with respect to revision .Ar rev . - .It Fl T - No effect. - For compatibility. .It Fl V Print RCS's version number. .It Fl x Ns Ar suffixes --- 62,67 ---- *************** *** 101,103 **** --- 98,105 ---- .Xr rcsclean 1 , .Xr rcsdiff 1 , .Xr rlog 1 + .Sh STANDARDS + The flag + .Op Fl T + has no effect and is provided + for compatibility only.