[PATCH V2] merge: Add support for 'union' merge strategy

[Erik Huelsmann]

>
>> I'm a bit spotty on time availability, but I'll get to resubmitting the
>> patches; hopefully without too much delay.
>>
>
> Just an FYI, the code freeze is in a week, after which it will have to
> wait until Aug 1.
>

Since it's my first submission, I'm going to take my time and resubmit
after Aug 1st. Thanks for the warning!

-- 
Bye,

Erik.

http://efficito.com -- Hosted accounting and ERP.
Robust and Flexible. No vendor lock-in.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150717/7fb81aff/attachment.html>