t / t5100 / msg0006on commit merge-recursive: don't segfault while handling rename clashes (c94736a)
   1Here is a patch from A U Thor.
   2