[PATCH 5 of 5] commands: merge and resolve have new option tool

Matt Mackall mpm at selenic.com
Thu Aug 7 14:34:50 CDT 2008


On Thu, 2008-08-07 at 08:01 +0100, Frank Kingswood wrote:
> S. Heimberg wrote:
> > # HG changeset patch
> > # User simohe at besonet.ch
> > # Date 1218044877 -7200
> > # Node ID aecf481af058053bae639a306650815eaa65c816
> > # Parent  44bdc2e3a7dcd38f6448d4118c355004eef22bc2
> > commands: merge and resolve have new option tool
> 
> > +mergeopts = [
> > +    ('t', 'tool', '', _('force to use merge tool'))
> > +]
> > +
> Hmmm, using a single letter option for something that is just a wart to 
> Mercurial to help out systems where "HGMERGE=blah hg merge..." does not 
> work seems unfortunate. Can this be --tool only?

I think --tool is (or should be) different from HGMERGE in that it takes
advantage of the the more modern tool configuration options and command
line expansion, etc., whereas HGMERGE has a fixed calling convention and
argument order.

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list