t / t4013 / diff.diff-tree_-p_masteron commit read-cache: fix directory/file conflict handling in read_index_unmerged() (ad37620)
   1$ git diff-tree -p master
   2$