t / t5100 / msg0016--no-inbody-headerson commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Date: bogus
   2
   3and some content
   4