Next: , Previous: , Up: Usage   [Contents][Index]

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.


Use diff3 -A, -E (default), or -e, respectively.


Write to stdout instead of overwriting receiving-sibling.


See Misc common options. Suppress conflict warnings.


(up to three times) Specify the conflict labels for receiving-sibling, parent and other-sibling, respectively.


Note that -Vn is not a valid option for merge, in contrast to most other RCS commands (see Misc common options).