Add builtin merge-file, a minimal replacement for RCS merge