summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:21 (GMT)
commit1d699f79340b40b8020d9ed570aab124186fbd97 (patch)
tree05921d40c4e61e4fc41c089dbb0496cde9fae27c /ident.c
parent61d7503da141f13bc916b36012760791761cc909 (diff)
parentd4e98b581b5b3b70ca58cb6677ec02bee4ae7007 (diff)
downloadgit-1d699f79340b40b8020d9ed570aab124186fbd97.zip
git-1d699f79340b40b8020d9ed570aab124186fbd97.tar.gz
git-1d699f79340b40b8020d9ed570aab124186fbd97.tar.bz2
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