t / t5100 / msg0011on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1Here comes a commit log message, and
   2its second line is here.