templates / this--descriptionon commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1Unnamed repository; edit this file to name it for gitweb.