merge-recursive: don't segfault while handling rename clashes
[git] / t / t5100 / msg0006
1 Here is a patch from A U Thor.
2