t / t5100 / rfc2047-info-0006on commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1Subject: (a b)
   2