On Fri, Oct 16, 2009 at 12:10 PM, Adrian Buehlmann <adr...@cadifra.com> wrote: > I can reproduce the problem with 23e60a084681 now. Thanks for posting > your config settings. > > Using revision 74061568b17f (the one before my patch) I get a three-way diff > for > merge changesets in kdiff3, with 23e60a084681 (my patch) kdiff3 shows only two > way diffs for merge csets. > > The three-way diffs are a really interesting feature.
Ah, I'm slow on the uptake today. Sune is probably right, we should use --change when vdiffnowin is configured. -- Steve Borho ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
