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

Matt Mackall mpm at selenic.com
Sat Oct 18 17:37:09 CDT 2014


On Thu, 2014-10-16 at 18:56 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1413478601 -7200
> #      Thu Oct 16 18:56:41 2014 +0200
> # Node ID 7ca9c45848200a39f8b6e4d6d083efee48993f6e
> # Parent  356c4ef428690d95cf0d98240ff76494ff25efb3
> config: move mergetools configuration to default configuration
> 
> The merge tool configuration is an essential part of a good initial user
> experience.
> 
> The installer fixes have been done blindly and might require additional
> changes.

Not clear how this patch works, as neither this patch nor the previous
one actually touch contrib/mergetools.hgrc, or create default-hgrc.d.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list