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