templates / this--descriptionon commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1Unnamed repository; edit this file 'description' to name the repository.