t / t4252 / file-2-0on commit merge-recursive: add computation of collisions due to dir rename & merging (ea625cb)
   11
   22
   33
   44
   55
   66
   77