t / t5100 / msg0001on commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1Here is a patch from A U Thor.
   2