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

Mads Kiilerich mads at kiilerich.com
Sun May 16 14:58:12 CDT 2010


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?

/Mads


More information about the Mercurial-devel mailing list