[PATCH 1 of 2 STABLE] filemerge: introduce a 'regkeyalt' merge tool variable

Matt Mackall mpm at selenic.com
Tue Mar 8 14:50:29 CST 2011


On Tue, 2011-03-08 at 14:48 -0600, Steve Borho wrote:
> On Tue, Mar 8, 2011 at 2:14 PM, Matt Mackall <mpm at selenic.com> wrote:
> > On Tue, 2011-03-08 at 13:36 -0600, Steve Borho wrote:
> >> # HG changeset patch
> >> # User Steve Borho <steve at borho.org>
> >> # Date 1299611118 21600
> >> # Branch stable
> >> # Node ID 5345edbefd8d264f3648f504ed41c2a1ee257cad
> >> # Parent  42a34c0aeddc76262e1c7d4d22d00c72af4dbba6
> >> filemerge: introduce a 'regkeyalt' merge tool variable
> >>
> >> This allows us to provide alternate search keys for 64bit operating systems that
> >> may have 32bit merge tools installed.  Presumably it may find other uses.
> >
> > Can regkey just be turned into a list entry?
> 
> Uhm, no.  That would break old configurations because configlist
> splits on spaces if it doesn't find any commas.

Ahh, I hadn't noticed the keys had spaces in them. Feel free to push
these then.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list