t / t5100 / patch0007on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1