RCS (cont)
Examples of using rcsmerge for file prog.c ...
- merge versions 2.8 and 3.4 and write to
prog.merged.c
rcsmerge -p -r2.8 -r3.4 prog.c >prog.merged.c
|
- "merge" versions 2.8 and 2.4 i.e. undo changes between 2.4-2.8
rcsmerge -r2.8 -r2.4 prog.c
|
For conflicts, both choices are incorporated into the merged file.
|