contrib / fast-import / git-p4.baton commit handle_delete_modify(): Check whether D/F conflicts are still present (84a08a4)
   1@python "%~d0%~p0git-p4" %*