Andrew's git / gitweb.git / t/t4013/diff.diff-tree_-p_master
?
t / t4013 / diff.diff-tree_-p_masteron commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1$ git diff-tree -p master
   2$