merge-recursive: combine error handling
[git] / t / t5100 / msg0015