t / t5100 / msg0016on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1and some content
   2