templates / branches--on commit merge-recursive: rename conflict_rename_*() family of functions (8ebe7b0)
   1: this is just to ensure the directory exists.