t / t4252 / file-1-0on commit rerere: teach rerere to handle nested conflicts (4af3220)
   11
   22
   33
   44
   55
   66
   77