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

[Matt Mackall]

On Wed, 2010-05-05 at 20:23 -0500, Steve Borho wrote:
> On Wed, May 5, 2010 at 8:16 PM, Steve Borho <steve at borho.org> wrote:
> > # HG changeset patch
> > # User Steve Borho <steve at borho.org>
> > # Date 1262924345 21600
> > # Node ID a4e07cd64644167ac80bc1999b0468c3bb946339
> > # Parent  9651fa5a3cbf68dfb2b5030feca8fff8e0146e04
> > 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:
> 
> If no-one objects to these changes, I have two more patches in mind.
> 
> #1 - add hgtk's diff3args for three-way visual diffs
> #2 - make 'hg extdiff' auto-detect a diff tool
> 
> My subversive goal is to merge this TortoiseHg functionality into
> extdiff so we can drop our separate merge-tools config file.

My only concern here is that sticking these options in with the merge
tool config is a little weird/confusing. What if I'm a newbie trying to
figure out how to configure a diff tool that's not a merge tool?

-- 
Mathematics is the supreme nostalgia of our time.