t / t5100 / msg0016on commit merge-recursive: add computation of collisions due to dir rename & merging (ea625cb)
   1and some content
   2