t / t5100 / msg0009on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1This is to fix diff-format documentation.
   2