[PATCH 3 of 3 V3] filemerge: add 'union' merge to internal merge tool

[Matt Mackall]

On Sun, 2015-08-16 at 10:56 +0200, ehuels at gmail.com wrote:
> # HG changeset patch
> # User Erik Huelsmann <ehuels at gmail.com>
> # Date 1439713140 -7200
> #      Sun Aug 16 10:19:00 2015 +0200
> # Node ID 0891b795ef6071786eb86a583bfa9c6efa4371e2
> # Parent  ef852de2d5f76e1cf6d9ca00b340d4302f6edb3c
> filemerge: add 'union' merge to internal merge tool

These are queued for default with a couple minor tweaks, thanks. You
reused the name _imerge here via cut&paste error. Also, I turned
__imerge into _merge.

Congratulations on your first Mercurial patches!

-- 
Mathematics is the supreme nostalgia of our time.