[PATCH] merge: make 'keep' message more descriptive

[Matt Mackall]

On Fri, 2014-12-05 at 11:59 -0800, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1417644200 28800
> #      Wed Dec 03 14:03:20 2014 -0800
> # Node ID 89d44cd0532a11b809dfc65c72a0bb5071f67951
> # Parent  406dfc63a1ad71213dccc1a45de99a3c5d5ac460
> merge: make 'keep' message more descriptive

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.