t / t5100 / msg0006on commit t6038 (merge.renormalize): try checkout -m and cherry-pick (d347cee)
   1Here is a patch from A U Thor.
   2