t / t5100 / msg0011on commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1Here comes a commit log message, and
   2its second line is here.