t / t5100 / msg0001on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Here is a patch from A U Thor.
   2