t / t5100 / msg0011on commit Merge branch 'jk/two-way-merge-corner-case-fix' into maint (4766036)
   1Here comes a commit log message, and
   2its second line is here.