t / t4252 / file-2-0on commit merge-recursive: check for directory level conflicts (53e32d4)
   11
   22
   33
   44
   55
   66
   77