t / t5100 / patch0007on commit t6038 (merge.renormalize): try checkout -m and cherry-pick (d347cee)
   1