[ANN] python based merge scripts

Patrick Mézard pmezard at gmail.com
Mon Sep 24 01:44:28 CDT 2007


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.

--
Patrick Mézard


More information about the Mercurial mailing list