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)
commit1d699f7...340b40b8020d9ed570aab124186fbd97
tree05921d4...c4e61e4fc41c089dbb0496cde9fae27ccopy hash to clipboard (tree)
parent61d7503...a141f13bc916b36012760791761cc909copy hash to clipboard (diff)
parentd4e98b5...1b5b3b70ca58cb6677ec02bee4ae7007copy hash to clipboard (diff)
t/t7506-status-submodule.sh