contrib / fast-import / git-p4.baton commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1@python "%~d0%~p0git-p4" %*