Andrew's git / gitweb.git / t/t4013/diff.diff-tree_-p_master
?
t / t4013 / diff.diff-tree_-p_masteron commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1$ git diff-tree -p master
   2$