t / t4013 / diff.diff-tree_-p_masteron commit handle_delete_modify(): Check whether D/F conflicts are still present (84a08a4)
   1$ git diff-tree -p master
   2$