templates / this--descriptionon commit Fall back to three-way merge when applying a patch. (47f0b6d)
   1Unnamed repository; edit this file to name it for gitweb.