t / t5100 / msg0018on commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1a commit message
   2