diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:21 -0700 |
| commit | 1d699f79340b40b8020d9ed570aab124186fbd97 (patch) | |
| tree | 05921d40c4e61e4fc41c089dbb0496cde9fae27c /ident.c | |
| parent | 61d7503da141f13bc916b36012760791761cc909 (diff) | |
| parent | d4e98b581b5b3b70ca58cb6677ec02bee4ae7007 (diff) | |
| download | git-1d699f79340b40b8020d9ed570aab124186fbd97.tar.gz | |
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
Diffstat (limited to 'ident.c')
0 files changed, 0 insertions, 0 deletions