contrib / fast-import / git-p4.baton commit merge script: refuse to merge during merge (6239af1)
   1@python "%~d0%~p0git-p4" %*