On 28-03-2010 23:44, Steve Borho wrote: > 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
Hmm, no, this is output from hg showconfig > 2) Some other criteria is forcing the diff window use (rename, special tools) No renames. I don't know all the criterias. I had it working at least once in the not too far past, though. > 3) There's a new bug in there somewhere Yes, maybe :) I just rechecked... it's just normal file modifications, and there are modifications vs. both parents. /Sune ------------------------------------------------------------------------------ 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
