[MERGE] fix rare merge crash bug [51108]

[Robert Collins]

On Thu, 2006-06-29 at 02:21 -0400, Aaron Bentley wrote:
> -----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

+1

I think this is a candidate for a backport, if we dont release 0.9
'soon'.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060629/89ff17b8/attachment.pgp