t / t5100 / info0016on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: check bogus body header (date)
   4Date: bogus 
   5