t / t4013 / diff.diff-tree_-p_initialon commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1$ git diff-tree -p initial
   2$