[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.6 and 1.7

version 1.6, 2006/04/19 11:16:14 version 1.7, 2006/04/24 08:18:06
Line 26 
Line 26 
 .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
 .Op Fl q 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 x Ns Ar suffixes
 .Op Fl z Ns Ar tz  .Op Fl z Ns Ar tz
   .Fl r Ns Ar rev
 .Ar  .Ar
 .Sh DESCRIPTION  .Sh DESCRIPTION
 The  The
Line 67 
Line 67 
 .It Fl r Ns Ar rev  .It Fl r Ns Ar rev
 Merge with respect to revision  Merge with respect to revision
 .Ar rev .  .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  .It Fl V
 Print RCS's version number.  Print RCS's version number.
 .It Fl x Ns Ar suffixes  .It Fl x Ns Ar suffixes
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7