[PATCH] merge: Fix segfault in Python when performing large merges on OS X (issue2937)

[Matt Mackall]

On Tue, 2011-09-13 at 09:47 +0200, Dan Villiom Podlaski Christiansen
wrote:
> # HG changeset patch
> # User Steve Streeting <steve at stevestreeting.com>
> # Date 1315478099 -3600
> # Node ID c606be029624b0b370ce8ac809c423b812e640fd
> # Parent  bfe903b1ff4eaa081ff4374b6d3744a0936b928e
> merge: Fix segfault in Python when performing large merges on OS X (issue2937)

For future reference, it's better to summarize the fix rather than its
largely random effects (which is already well-described in the bug
report):

osutil: avoid accidentally destroying the True object in isgui (issue2937)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.