contrib / fast-import / git-p4.baton commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1@python "%~d0%~p0git-p4" %*