Merge branch 'nm/maint-conflicted-submodule-entries' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:41:17 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:41:17 +0000 (10:41 -0700)
commit0c41f33...19c2f40015e31211557e818b000f9a25
tree082c327...38afe97d14a8417603034537392f4d8dcopy hash to clipboard (tree)
parentdf0a6ae...35be7855fc96417cd01dce3e8e5146f5copy hash to clipboard (diff)
parent313ee0d...9f58c2bf2f4e0a62b812c9d08a39b240copy hash to clipboard (diff)