t / t3900 / UTF-16.txton commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1