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

[Vincent Ladeuil]

A non-text attachment was scrubbed...
Name: spurious-conflicts-3950.patch
Type: text/x-patch
Size: 10694 bytes
Desc: BZR merge
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090121/291d2829/attachment.bin