t / t5100 / msg0001on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1Here is a patch from A U Thor.
   2