templates / branches--on commit merge-recursive: Make dead code for rename/rename(2to1) conflicts undead (0a6b871)
   1: this is just to ensure the directory exists.