From: Jens Lehmann <jens.lehmann@web.de>
Date: Mon, 04 Apr 2011 07:21:30 GMT
Subject: Re: What's cooking in git.git (Apr 2011, #01; Sun, 3)
Message-ID: <4D99717A.1030902@web.de>
In-Reply-To: <7v62quc464.fsf@alter.siamese.dyndns.org>

Am 04.04.2011 01:21, schrieb Junio C Hamano:
> * nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
>   (merged to 'next' on 2011-04-03 at 40c5094)
>  + submodule: process conflicting submodules only once
> 
> A fix to a rather common operation and the implementation looked
> low-impact enough.  Do submodule people want this in 1.7.5?

I concur and think this should go into 1.7.5.