From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Aug 2010 23:35:22 GMT
Subject: Re: [PATCH] rerere: demonstrate a weakness with identical conflicts in different files
Message-ID: <7vmxssvi2t.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4C629495.60105@viscovery.net>

Hmm, my knee-jerk reaction was that something may be keying off of the
conflict ids to keep track of which ones are dealt with and which ones are
yet to be resolved, but I don't recall any part of the implementation that
would do something like that offhand.  Sorry.

Will try to find/make time to take a look at it later.