t / t5100 / emptyon commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1