templates / branches--on commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1: this is just to ensure the directory exists.