t / t4252 / file-2-0on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   11
   22
   33
   44
   55
   66
   77