On Wed, Mar 10, 2010 at 7:12 AM, John Sparrow <[email protected]> wrote: > > In v1.0, repos explorer, following a merge, if you tick 'diff to second > parent' the correct set of file changes is shown. However if you double click > to open TMerge (or whatever), a diff with the *original* parent is performed!
Unless your merge tool supports 3way directory diffs, the expected behavior is for the visual diff window to be opened. The visual diff window will have buttons for directory diffs to either parent. This assumes your tool can do directory diffs. If it can only do single file diffs, the only way to visualize the second parent changes is to explicitly ask for changes between the merge changeset and the second parent using the 'visual Diff with selected' changeset context menu. -- 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-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
