templates / this--descriptionon commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1Unnamed repository; edit this file to name it for gitweb.