templates / this--descriptionon commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Unnamed repository; edit this file to name it for gitweb.