templates / branches--on commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1: this is just to ensure the directory exists.