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

[Matt Harbison]

On Sun, 02 Nov 2014 17:06:00 +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
> 
> The merge tool configuration is an essential part of a good initial user
> experience. 'make osx' installers and direct 'make' installation did not
> have merge tool configuration. Now they have.
> 
> Note: The installer fixes for windows have been done blindly and might
> require additional changes.

It's entirely possible I screwed something up with the Windows installer 
because it's the first time I attempted to build it, but I didn't get a 
hgrc.d folder created on my Win7 x64 system (I built a 32 bit installer).  
The merge-tools are still listed in the system mercurial.ini though:

$ hg.exe --debug showconfig merge-tools
read config from: c:\Program Files (x86)\Mercurial2\mercurial.ini
read config from: C:\MinGW\msys\1.0\home\Matt\mercurial.ini
read config from: C:\MinGW\msys\1.0\home\Matt\.hgrc
read config from: C:\Users\Matt\mercurial.ini
read config from: C:\Users\Matt\.hgrc
c:\Program Files (x86)\Mercurial2\mercurial.ini:102: merge-
tools.kdiff3.args=...

I very much like the idea of making a consistent stock configuration 
available to all platforms though.

--Matt