test that git status works with merge conflict in, .gitmodules
[git] / t / t5100 / msg0016
1 and some content
2