rcs: rcsmerge

 
 2.9 Invoking rcsmerge
 =====================
 
      rcs merge [options] file
      (or “rcsmerge” instead of “rcs merge”)
 
 The rcsmerge command incorporates the changes between two revisions of
 an RCS file into the corresponding working file.
 
 -A
 -E
 -e
      Passed to the diff3 command.  The default if none are specified is
      ‘-E’.  With ‘-e’, suppress warnings on conflict.  The ‘-A’ style
      generates the most verbose output.  ⇒(diff)Invoking diff3.
 
 -p[REV]
      Write to standard output instead of overwriting the working file.
 
 -q[REV]
      ⇒Misc common options.
 
 -rREV
      (one or two times) specify a revision.
 
 One or two revisions must be specified (using ‘-p’, ‘-q’, ‘-r’).  If
 only one is specified, the second revision defaults to the latest
 revision on the default branch.
 
 -kSUBST
      ⇒Substitution mode option.
 
 -V
 -VN
 -xSUFF
      ⇒Misc common options.
 
 -zZONE
      ⇒Date option.
 
 These options have no effect, and are included solely for consistency
 with other commands (⇒Environment): ‘-T’.