[PATCH 6 of 6 V2] merge: add a internal:merge3 tools

[Matt Mackall]

On Tue, 2014-08-05 at 16:30 -0700, pierre-yves.david at ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1407275925 25200
> #      Tue Aug 05 14:58:45 2014 -0700
> # Node ID e1204f7bc5ed4568c6b3fd29dd637c1907bc6566
> # Parent  0c3bb100f3a682832b1b44b97e3402d9e1963360
> merge: add a internal:merge3 tools.

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.