t / t5100 / msg0011on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1Here comes a commit log message, and
   2its second line is here.