test that git status works with merge conflict in, .gitmodules
authorHeiko Voigt <hvoigt@hvoigt.net>
Sat, 14 May 2011 16:26:30 +0000 (18:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 May 2011 17:57:51 +0000 (10:57 -0700)
commit44ca0c8...d927c8e7525ceec412704ff9967ff6ac
tree44d1a9e...4289aff7a5f150f1e53c8e2c0779de28copy hash to clipboard (tree)
parent375f8a0...2e9f47d362afd5ea2443f77bcba685cbcopy hash to clipboard (diff)
t/t7506-status-submodule.sh