t / t5100 / msg0006on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Here is a patch from A U Thor.
   2