templates / this--descriptionon commit merge-recursive: Fix modify/delete resolution in the recursive case (ec61d14)
   1Unnamed repository; edit this file 'description' to name the repository.