rcs: merge
2.5 Invoking merge
==================
merge [options] receiving-sibling parent other-sibling
The merge command combines the differences between a the parent and the
other sibling, and the differences between the parent and the receiving
sibling. It writes the result to the receiving sibling.
-A
-E
-e
Use ‘diff3’ ‘-A’, ‘-E’ (default), or ‘-e’, respectively.
-p
Write to standard output instead of overwriting RECEIVING-SIBLING.
-q
⇒Misc common options. Suppress conflict warnings.
-L LABEL
(up to three times) Specify the conflict labels for
RECEIVING-SIBLING, PARENT and OTHER-SIBLING, respectively.
-V
Note that ‘-VN’ is _not_ a valid option for merge, in contrast to
most other RCS commands (⇒Misc common options).