From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Apr 2011 10:41:24 +0000 (-0700)
Subject: Merge branch 'nm/maint-conflicted-submodule-entries'
X-Git-Tag: v1.7.5-rc1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1eb71bc0ec609c67b8a308f9267691144a48bffd?ds=inline;hp=--cc

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

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

1eb71bc0ec609c67b8a308f9267691144a48bffd