t / t5100 / rfc2047-info-0004on commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4