On Sat, Mar 27, 2010 at 6:57 PM, Sune Foldager <sune.folda...@me.com> wrote: > When I double click (or select visualize changes) on a merge node, > kdiff3 opens and it shows me... 2-way directory diff against the first > parent. There seems to be no way to display the diff against the second > parent, and what I really wanted is 3-way directory diff. > > My relevant configuration fragment looks like this: > > kdiff3.priority = -1 > kdiff3.regkey = Software\KDiff3 > kdiff3.regappend = \kdiff3.exe > kdiff3.args = --auto --L1 BASE --L2 LOCAL --L3 OTHER --cs "TryHard=0" > $base $local $other -o $output > kdiff3.premerge = False > kdiff3.fixeol = True > kdiff3.gui = True > kdiff3.diffargs = --L1 '$plabel1' --L2 '$clabel' $parent $child > kdiff3.diff3args = --L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' > $parent1 $child $parent2 > kdiff3.dirdiff = True > kdiff3.dir3diff = True > > The main difference from stock thg is dir3diff = True and premerge = > False (to handle ansi/utf-8 changes correctly; we should include this > setting in thg IMO, but we can discuss that elsewhere.) Also, I disable > kdiff3's TryHard option, to get less cluttered diffs. > > I could've sworn I had this working some time ago with a previous > TortoiseHg (after the diff changes). Am I missing something, or is this > a bug?
premerge has no bearing on visual diff, so that change can be ignored. It's the dir3diff that determines whether it shows three-way directory diffs (where possible). So there's three things that could make that not work: 1) Some other rc file is setting dir3diff to False 2) Some other criteria is forcing the diff window use (rename, special tools) 3) There's a new bug in there somewhere -- Steve Borho ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
