[ANN] python based merge scripts

[Steve Borho]

On Mon, 2007-09-24 at 08:44 +0200, Patrick Mézard wrote:
> Steve Borho a écrit :
> > Since kdiff3 has an '--auto' option, it is considered both
> > non-interactive and interactive.  On Windows, it's likely the only
> > non-interactive tool you'll have.
> 
> You may try "contrib/simplemerge" on last resort.

Yes, that will do in a pinch.  The hardest part will be finding where it
was installed.

-- 
Steve Borho (steve at borho.org)
http://www.borho.org/~steve/steve.asc
Key fingerprint = 2D08 E7CF B624 624C DE1F  E2E4 B0C2 5292 F2C6 2C8C