From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Thu, 10 May 2012 15:41:04 GMT
Subject: Re: [PATCH 6/8] apply: fall back on three-way merge
Message-ID: <vpq1ums2gdr.fsf@bauges.imag.fr>
In-Reply-To: <7v4nrooyv1.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> What happens if there are multiple objects for the same pre_sha1?
>
> [...]The usefulness of -3 is limited to only two cases
> in practice, and neither case gives you a big chance of seeing such a
> collision. 

Ah, OK, I missed the fact that the index line was using
find_unique_abbrev(), not a fix number of characters. Thanks for the
clarification.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/