Merge branch 'jl/submodule-conflicted-gitmodules'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:21 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:21 +0000 (20:37 -0700)
commit1d699f79340b40b8020d9ed570aab124186fbd97
tree05921d40c4e61e4fc41c089dbb0496cde9fae27c
parent61d7503da141f13bc916b36012760791761cc909
parentd4e98b581b5b3b70ca58cb6677ec02bee4ae7007
Merge branch 'jl/submodule-conflicted-gitmodules'

* jl/submodule-conflicted-gitmodules:
  Submodules: Don't parse .gitmodules when it contains, merge conflicts
  test that git status works with merge conflict in, .gitmodules
t/t7506-status-submodule.sh