[BACK]Return to rcsmerge.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / rcs

Diff for /src/usr.bin/rcs/rcsmerge.1 between version 1.5 and 1.6

version 1.5, 2006/03/06 14:44:51 version 1.6, 2006/04/19 11:16:14
Line 22 
Line 22 
 .Nd merge RCS revisions  .Nd merge RCS revisions
 .Sh SYNOPSIS  .Sh SYNOPSIS
 .Nm  .Nm
 .Bk -words  
 .Op Fl AEeV  .Op Fl AEeV
 .Op Fl k Ns Ar mode  .Op Fl k Ns Ar mode
 .Op Fl p Ns Op Ar rev  .Op Fl p Ns Op Ar rev
Line 30 
Line 29 
 .Op Fl r Ns Ar rev  .Op Fl r Ns Ar rev
 .Op Fl x Ns Ar suffixes  .Op Fl x Ns Ar suffixes
 .Op Fl z Ns Ar tz  .Op Fl z Ns Ar tz
 .Ar file ...  .Ar
 .Ek  
 .Sh DESCRIPTION  .Sh DESCRIPTION
 The  The
 .Nm  .Nm
 program merges changes between two revisions of an RCS file into  program merges changes between two revisions of an RCS file into
 the corresponding working file.  the corresponding working file.
   .Pp
   .Nm
   also supports
   keyword substitution \(en
   see the
   .Xr rcs 1
   man page for more information.
 .Pp  .Pp
 The following options are supported:  The following options are supported:
 .Bl -tag -width Ds  .Bl -tag -width Ds
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6