[PATCH] merge: fast-forward merge with descendant

[Matt Mackall]

On Tue, 2010-12-07 at 03:35 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <mads at kiilerich.com>
> # Date 1291688961 -3600
> # Branch stable
> # Node ID a68519c47a07b46392a29e486f0036ad42bc53dd
> # Parent  acebcefa86d45560e271359663f9c0d9d5663573
> merge: fast-forward merge with descendant

Looks good, queued.

-- 
Mathematics is the supreme nostalgia of our time.