[PATCH STABLE] simplemerge: do not allow binary files to abort an entire merge

[Matt Mackall]

On Fri, 2011-05-13 at 19:47 -0500, Steve Borho wrote:
> # HG changeset patch
> # User Steve Borho <steve at borho.org>
> # Date 1305333996 18000
> # Branch stable
> # Node ID 3c65cdcf3ba6cdaa75e7b9e6eb8ef0ff0d3db197
> # Parent  2a6ee654655e5eb2f42665d968835c3bc5743037
> simplemerge: do not allow binary files to abort an entire merge

Queued, thanks.

-- 
Mathematics is the supreme nostalgia of our time.