contrib / fast-import / git-p4.baton commit t6038 (merge.renormalize): try checkout -m and cherry-pick (d347cee)
   1@python "%~d0%~p0git-p4" %*