t / t5100 / msg0015on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1  - a list
   2  - of stuff