RCS

• RCS works gracefully for solo

ci file
co file
rlog file
rcsmerge -p -r2.8 -r3.4 file > merged

What about collaborating?

This was also solved in 1992

• CVS: Brian Berliner, Jeff Polk