Andrew's git / gitweb.git / t/t4013/diff.diff-tree_-p_master
?
t / t4013 / diff.diff-tree_-p_masteron commit checkout --conflict=diff3: add a label for ancestor (f0531a2)
   1$ git diff-tree -p master
   2$