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