t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit am: suppress apply errors when using 3-way (3ddd170)
   1$ git diff-tree --pretty=oneline -p initial
   2$