GNU RCS 5.9.1: merge

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.

-A
-E
-e

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

-p

Write to stdout instead of overwriting receiving-sibling.

-q

See Misc common options. Suppress conflict warnings.

-Llabel

(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 (see Misc common options).


33 visits (1 today, 3 this week, 2 this month, 26 this year)
Uptime: 04:35:21 up 12 days, 11:59, 0 users, load average: 0.00, 0.00, 0.00
3.239.33.139 GET from server z.lam1.us

Friday, March 5, 2021 @ 4:35:21 AM
z.ServerAdmin@lam1.us