From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Apr 2011 17:41:17 +0000 (-0700)
Subject: Merge branch 'nm/maint-conflicted-submodule-entries' into maint
X-Git-Tag: v1.7.4.4~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0c41f33c19c2f40015e31211557e818b000f9a25;p=git.git

Merge branch 'nm/maint-conflicted-submodule-entries' into maint

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

0c41f33c19c2f40015e31211557e818b000f9a25