t / t5100 / msg0009on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1This is to fix diff-format documentation.
   2