contrib / fast-import / git-p4.baton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1@python "%~d0%~p0git-p4" %*