templates / this--descriptionon commit merge-recursive: rename conflict_rename_*() family of functions (8ebe7b0)
   1Unnamed repository; edit this file 'description' to name the repository.