[PATCH 2 of 2] config: move mergetools configuration from contrib to default configuration

[Matt Mackall]

On Sun, 2014-11-02 at 17:06 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1413681743 -7200
> #      Sun Oct 19 03:22:23 2014 +0200
> # Branch stable
> # Node ID a694e00352fdf48b1c0bdea7095e3a8067b71169
> # Parent  5ae61db1890019841e9178c5b7fb56a9aba1af1e
> config: move mergetools configuration from contrib to default configuration

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.