t / t5100 / msg0001on commit am: suppress apply errors when using 3-way (3ddd170)
   1Here is a patch from A U Thor.
   2