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