templates / branches--on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1: this is just to ensure the directory exists.