GNU RCS 5.9.1: 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. See Invoking diff3 in The GNU Diffutils Manual.
-p[rev]: Write to stdout instead of overwriting the working file.
-q[rev]: See 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: See Substitution mode option.
-V
-Vn
-xsuff: See Misc common options.
-zzone: See Date option.

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

181 visits (1 today, 6 this week, 29 this month, 181 this year)
Uptime: 22:31:28 up 4 days, 4:14, 3 users, load average: 0.00, 0.00, 0.00
3.137.159.163 GET from server z.larrymurakami.com

Saturday, December 21, 2024 @ 10:31:28 PM
z.ServerAdmin@lam1.us