contrib / fast-import / git-p4.baton commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1@python "%~d0%~p0git-p4" %*