contrib / fast-import / git-p4.baton commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1@python "%~d0%~p0git-p4" %*