Re: [PATCH 6/8] apply: fall back on three-way merge

Junio C Hamano [off-list ref] writes:

Matthieu Moy [off-list ref] writes:

quoted

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/