t / t5100 / msg0006on commit merge-recursive: Nuke rename/directory conflict detection (605c1bc)
   1Here is a patch from A U Thor.
   2