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