templates / this--descriptionon commit Add 'ours' merge strategy. (64da9e6)
   1Unnamed repository; edit this file to name it for gitweb.