t / t5100 / msg0011on commit Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 (d9b0443)
   1Here comes a commit log message, and
   2its second line is here.