templates / branches--on commit Add 'ours' merge strategy. (64da9e6)
   1: this is just to ensure the directory exists.