contrib / fast-import / git-p4.baton commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1@python "%~d0%~p0git-p4" %*