t / t4252 / file-1-0on commit diff-files: show unmerged entries correctly (095ce95)
   11
   22
   33
   44
   55
   66
   77