templates / branches--on commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1: this is just to ensure the directory exists.