t / t5100 / rfc2047-info-0007on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1Subject: (ab)
   2