t / t4013 / diff.diff-tree_masteron commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1$ git diff-tree master
   2$