templates / this--descriptionon commit git-merge: minor fix for no_trivial_merge_strategies. (de6f0de)
   1Unnamed repository; edit this file to name it for gitweb.