> > g) three-way visual diffs > > Would this strictly be for "Diffs" or are you looking at a three- > way visual > > diff / merge? I typically use DiffMerge for two / three way > merging. > > I mean supporting visual diffs on merge changesets. If your tool > supported it, it would show you the 3-way diffs in the merge commit > (diff to both parents).
I'd spend the whole dollar on that. What I'd _really_ like (and might have a go at implementing at some point if nobody else does) would be a way of easily doing all four relevant diffs for a merge, i.e. base->local, base->other, local->merged, other->merged. These could be four options on a context menu e.g. in the hgtk status window. For really complicated merges (e.g. Visual Studio .rc files) I find I have to do all of these diffs to figure out what's really going on, and thus far have had to do them manually. I don't need a 3-way diff tool for this, I just Alt-Tab between different WinMerge windows. Colin Latest News at: http://www.indigovision.com/news2009.php ------------------------------------------------------------------------------ Come build with us! The BlackBerry® 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/devconf _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
