t / t4013 / diff.diff-tree_-p_masteron commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1$ git diff-tree -p master
   2$