| commit | cc6c7e82981e91501dc98f94e565f15ae4591a0c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:22:42 +0000 (16 17:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:22:42 +0000 (16 17:22 -0700) | ||
| tree | 42d5454478d09700886896c38ca7a20134391eac | treesnapshot (tar.gz zip) |
| parent | 2a63845d0d2a3affb8fec5b43b353f4f3edebe81 | commitdiff |
| parent | d4e98b581b5b3b70ca58cb6677ec02bee4ae7007 | commitdiff |
Merge branch 'jl/submodule-conflicted-gitmodules' into next
* jl/submodule-conflicted-gitmodules:
Submodules: Don't parse .gitmodules when it contains, merge conflicts
test that git status works with merge conflict in, .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 | diff1 | diff2 | blobhistory |