t / t5100 / msg0011on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Here comes a commit log message, and
   2its second line is here.