templates / branches--on commit mergetool: honor diff.orderFile (57937f7)
   1: this is just to ensure the directory exists.