templates / branches--on commit Add builtin merge-file, a minimal replacement for RCS merge (ba1f5f3)
   1: this is just to ensure the directory exists.