[PATCH] extdiff: add labels, read diff arguments from [merge-tools]

Steve Borho steve at borho.org
Sun May 16 15:32:55 CDT 2010


On Sun, May 16, 2010 at 2:58 PM, Mads Kiilerich <mads at kiilerich.com> wrote:
> Steve Borho wrote, On 05/15/2010 07:31 PM:
>>
>> # HG changeset patch
>> # User Steve Borho<steve at borho.org>
>> # Date 1262924345 21600
>> # Node ID 53e70c7714bc9dc14116c0d6514157e95a790c09
>> # Parent  ba78a1bfbfd9fbe0fa48a05b8d94e6dcf431f635
>> extdiff: add labels, read diff arguments from [merge-tools]
>>
>> hgtk has been using these same configs since Feb. Users only have to name
>> the
>> tools they would like to use, ex:
>>
>
> There seems to be other differences between Tortoisehg contrib/mergetools.rc
> and Mercurials contrib/mergetools.hgrc. Would it make sense to merge them
> further? Any reasons not to do?

I would like to merge all of the mergetools text, and most of the
functionality to extdiff.  Not all of it makes sense in extdiff, as it
has no GUI fallback if your selected tool isn't up to the task, but it
could at least ask the user to restrict the diff to a single file, for
instance.

--
Steve Borho


More information about the Mercurial-devel mailing list