Fix bogus error message from merge-recursive error path
[git] / t / t5100 / msg0001
1 Here is a patch from A U Thor.
2