templates / this--descriptionon commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1Unnamed repository; edit this file to name it for gitweb.