t / t4013 / diff.diff-tree_--pretty=oneline_--patch-with-stat_initialon commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1$ git diff-tree --pretty=oneline --patch-with-stat initial
   2$