t / t4252 / file-2-0on commit t6038 (merge.renormalize): try checkout -m and cherry-pick (d347cee)
   11
   22
   33
   44
   55
   66
   77