t / t5100 / msg0015on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1  - a list
   2  - of stuff