RelNoteson commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1Documentation/RelNotes/1.7.5.2.txt