t / t4013 / diff.diff-tree_-p_masteron commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1$ git diff-tree -p master
   2$