(rcs.info)rcsmerge

---

Next: rlog Prev: rcsdiff Up: Usage

---

Enter node , (file) or (file)node

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.  Note: (diff)Invoking diff3.

‘-p[REV]’
     Write to stdout instead of overwriting the working file.

‘-q[REV]’
     Note: 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’
     Note: Substitution mode option.

‘-V’
‘-VN’
‘-xSUFF’
     Note: Misc common options.

‘-zZONE’
     Note: Date option.

These options have no effect, and are included solely for consistency
with other comamnds (Note: Environment): ‘-T’.