[MERGE] fix rare merge crash bug [51108]

[Aaron Bentley]

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

Hi all,

This patch fixes 51108.

The bug caused merge to crash in the following situation:
1. The file's contents had been changed in THIS
2. The file's execute bit had been changed in THIS
3. The file had been deleted in OTHER

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEo3Fq0F+nu1YWqI0RAktZAJ0fJAL7FApiEWuFSnSUgjBSXMKIbQCfZ0tH
JyDavEr9lxTVXkDF8IEiIrE=
=BrTA
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: executable-conflict.patch
Type: text/x-patch
Size: 2567 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060629/b67d194d/attachment.bin