Andrew's git / gitweb.git / t/t4013/diff.diff-tree_master
?
t / t4013 / diff.diff-tree_masteron commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1$ git diff-tree master
   2$