[PATCH] merge: extract _resolvetrivial() function

[Matt Mackall]

On Wed, 2014-12-10 at 13:18 -0800, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1417643428 28800
> #      Wed Dec 03 13:50:28 2014 -0800
> # Node ID 9b8dc07b08a2721d1db6f218bee06880a40d168d
> # Parent  07fcb956212223676b35055d39dddac88ca990b6
> merge: extract _resolvetrivial() function

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.