t / t5100 / msg0016on commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1and some content
   2