contrib / fast-import / git-p4.baton commit t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge (4947cf9)
   1@python "%~d0%~p0git-p4" %*