t / t5100 / patch0007on commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1