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)
commit0c41f33c19c2f40015e31211557e818b000f9a25
tree082c327638afe97d14a8417603034537392f4d8d
parentdf0a6aeb35be7855fc96417cd01dce3e8e5146f5
parent313ee0d69f58c2bf2f4e0a62b812c9d08a39b240
Merge branch 'nm/maint-conflicted-submodule-entries' into maint

* nm/maint-conflicted-submodule-entries:
  submodule: process conflicting submodules only once