t / t4252 / file-2-0on commit am: suppress apply errors when using 3-way (3ddd170)
   11
   22
   33
   44
   55
   66
   77