Code

Get rid of the dependency on RCS' merge program