t / t5100 / msg0011on commit merge-recursive: Fix D/F conflicts (3734893)
   1Here comes a commit log message, and
   2its second line is here.