templates / this--descriptionon commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1Unnamed repository; edit this file 'description' to name the repository.