filemerge: A feature request

[Thomas Arendsen Hein]

* Matt Mackall <mpm at selenic.com> [20080206 17:25]:
> On Wed, 2008-02-06 at 00:51 -0600, Steve Borho wrote:
> > You can specify a binary merging tool in the merge-tools specification.
> > 
> > [merge-tools]
> > mytool.args = $local $base $other
> > mytool.binary = true
> >
> > However, there's no explicit way to say:  binary -> internal:local
> 
> Well... you can do:
> 
> [merge-tools]
> internal:other.binary = True
> internal:other.priority = -100
> 
> ..which says "if nothing else can merge this binary. take the other
> version".

No, "internal:other..." is interpreted as "internal = other...".

Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Osnabrueck - Register: Amtsgericht Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner