[PATCH] mergetools.hgrc: add minimal configuration for editmerge

[Matt Mackall]

On Thu, 2014-05-29 at 12:27 -0700, pierre-yves.david at ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1401391525 25200
> #      Thu May 29 12:25:25 2014 -0700
> # Node ID deb6b5713557f9c3f2e6320e87b11c108d4aafec
> # Parent  7c5a85619dca0fb0af0b9ad6fd1dc3147b2da0dd
> mergetools.hgrc: add minimal configuration for editmerge

I've queued this with some English fixes. We can address the priority
question in a follow-up patch.

-- 
Mathematics is the supreme nostalgia of our time.