GNU RCS 5.9.1: rcsmerge

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


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.


41 visits (1 today, 4 this week, 3 this month, 34 this year)
Uptime: 03:31:57 up 12 days, 10:56, 0 users, load average: 0.00, 0.00, 0.00
3.239.33.139 GET from server z.lam1.us

Friday, March 5, 2021 @ 3:31:57 AM
z.ServerAdmin@lam1.us