templates / this--descriptionon commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1Unnamed repository; edit this file to name it for gitweb.