templates / this--descriptionon commit Use git-merge instead of git-resolve in git-pull. (f887564)
   1Unnamed repository; edit this file to name it for gitweb.