t / t5100 / info0003on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: third patch
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5