[MERGE] fix rare merge crash bug [51108]

[Martin Pool]

On 29 Jun 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> 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

Looks plausible to me.  +1

-- 
Martin