templates / branches--on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1: this is just to ensure the directory exists.