program merges changes between two
revisions of an RCS file into the corresponding working file.
also supports keyword substitution
– see the rcs(1)
for more information.
The following options are supported:
- Default merge: see
diff3(1) for details.
- Specify the keyword substitution mode.
- Print result to standard output.
- Be quiet about reporting.
- Merge with respect to revision
rev. This option should be specified
twice to merge changes between two specific revisions. If only one
revision is specified, merging is done between that revision and the
latest revision of the default branch.
- Print RCS's version number.
- Specify the suffixes for RCS files. Suffixes should be
separated by the ‘/’ character.
- Specify the time zone for keyword substitution.
- If set, this variable should contain a list of
space-delimited options that are prepended to the argument list.
utility exits with one of the
- No overlaps.
- Overlaps were found.
- An error occurred.
Merge differences between revision 1.4 and 1.8 of
and print the result to standard output:
$ rcsmerge -p -r1.4 -r1.8 foo.c
Undo changes between revision 2.4 and 2.8 of foo.c
overwriting the working copy:
$ rcsmerge -r2.8 -r2.4 foo.c
The flags [-AeT
] have no
effect and are provided for compatibility only.