t / t4013 / diff.diff-tree_-p_masteron commit am: suppress apply errors when using 3-way (3ddd170)
   1$ git diff-tree -p master
   2$