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

Dirkjan Ochtman dirkjan at ochtman.nl
Fri Jan 8 07:27:59 UTC 2010


On Fri, Jan 8, 2010 at 05:19, Steve Borho <steve at borho.org> wrote:
> # HG changeset patch
> # User Steve Borho <steve at borho.org>
> # Date 1262924345 21600
> # Node ID 0b4e543b2c122a0e9bb3ae0717dd94dd25bd727e
> # Parent  3ab391dd5ec5ab1f4af06169bde7a9c850a7f4ce
> extdiff: add labels, read diff arguments from [merge-tools]
>
> The intent of this change is to allow us to ship tuned diff arguments for
> popular visual diff tools in our mergetools.hgrc file.  Users will only have to
> name the tools they would like to use in their [extdiff] sections.

Do you have an example of what that would look like?

Cheers,

Dirkjan



More information about the Mercurial-devel mailing list