[MERGE] Fix an edge case with deleted files and criss-cross merges

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
> This fixes an edge case where we were repeating an already
> resolved conflict (see the updated tests for a more detailed
> explanation).
> 
> Some other edge cases still seem to exist but they are
> sufficiently different to deserve a different patch.
> 
>       Vincent and John
> 
> 

Approve from my end, but as I helped on the patch I'm not sure that my
vote is sufficient.

BB:comment

If nobody else responds, I think we can safely merge it after a day or two.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkl3QjMACgkQJdeBCYSNAANOegCeIkUF1STn9pGpRbWj5Wn8rAsS
h50An3RW/2uNovNxWyBGHFBKaEcO6uUB
=/m/N
-----END PGP SIGNATURE-----