[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.4 and 1.5

version 1.4, 2006/03/06 09:41:53 version 1.5, 2006/03/06 14:44:51
Line 23 
Line 23 
 .Sh SYNOPSIS  .Sh SYNOPSIS
 .Nm  .Nm
 .Bk -words  .Bk -words
 .Op Fl AEeTV  .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
 .Op Fl q Ns Op Ar rev  .Op Fl q Ns Op Ar rev
Line 62 
Line 62 
 .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 .
 .It Fl T  
 No effect.  
 For compatibility.  
 .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
Line 101 
Line 98 
 .Xr rcsclean 1 ,  .Xr rcsclean 1 ,
 .Xr rcsdiff 1 ,  .Xr rcsdiff 1 ,
 .Xr rlog 1  .Xr rlog 1
   .Sh STANDARDS
   The flag
   .Op Fl T
   has no effect and is provided
   for compatibility only.
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5