[PATCH] largefiles: handle merges between normal files and largefiles (issue3084)

[Matt Mackall]

On Thu, 2011-12-15 at 15:13 +0100, Martin Geisler wrote:
> # HG changeset patch
> # User Martin Geisler <mg at aragost.com>
> # Date 1323448500 -3600
> # Branch stable
> # Node ID 8efb114d5bb3761c6e5b8d4e77365705109a44d7
> # Parent  dc5d1394ecd1ca252a536fca6f97ed59bfb32d50
> largefiles: handle merges between normal files and largefiles (issue3084)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.