templates / this--descriptionon commit Fix bogus error message from merge-recursive error path (0424138)
   1Unnamed repository; edit this file to name it for gitweb.