Andrew's git / gitweb.git / t/t4013/diff.diff-tree_master
?
t / t4013 / diff.diff-tree_masteron commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1$ git diff-tree master
   2$