Perform a three-way merge of file revisions,
taking two differing versions and incorporating the changes
into the working
You must provide either one or two revisions to merge
Overlaps are handled the same as with
by placing warnings in the resulting file.
accepts the standard options
exits with a status of 0 (no overlaps), 1 (some overlaps),
or 2 (unknown problem).
When comparing revisions, expand keywords using style
for values of
Send merged version to standard output instead of overwriting
or, if no
is given, merge the latest revision.
Suppose you need to add updates to an old revision (1.3) of
but the current file is already at revision 1.6. To incorporate the
co -l prog.c
(edit latest revision by adding revision 1.3 updates, then:)
rcsmerge -p -r1.3 -r1.6 prog.c > prog.updated.c
Undo changes between revisions 3.5 and 3.2, and overwrite the
rcsmerge -r3.5 -r3.2 chap08