t / t5100 / msg0009on commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1This is to fix diff-format documentation.
   2