t / t5100 / msg0016on commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1and some content
   2