Files
git-mirror/t/t7506-status-submodule.sh
Junio C Hamano 1d699f7934 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
2011-05-19 20:37:21 -07:00

7.0 KiB
Executable File