templates / branches--on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1: this is just to ensure the directory exists.