t / t4252 / file-1-0on commit rebase: show consistent conflict resolution hint (89c7ae9)
   11
   22
   33
   44
   55
   66
   77