On Tue, Jan 12, 2010 at 11:43 AM, Stanimir Stamenkov <s7a...@netscape.net> wrote: > Mon, 11 Jan 2010 22:58:08 -0600, /Steve Borho/: > >> I just discovered TortoiseMerge cannot do three-way file comparisons. >> This means it cannot be used to visualize merge changesets, which is a >> pretty big strike against it. >> >> I may have to investigate other tools, or stick with KDiff3. > > As far as I've seen TortoiseMerge does three-way merges fine (not > sure if you need three-way comparison exactly) - it just displays > them slightly different. It shows two panes with the two versions > to be merged and it shows the differences (all inclusions, deletions > and changes) between them and the base version in those two panes > instead of showing a third pane for the base revision alone. It > shows a third "merged" pane which is manually editable also. This > is pretty much what I've seen with KDiff3 where only the view of the > base common ancestor is merged into the view of the two versions to > be merged.
Yes, TortoiseMerge does three-way merges just fine, but I'm talking about a three-way comparison. This means being able to see how the merged file differs from it's two parent files (after the merge has been committed). There doesn't appear to be any way to do this. -- Steve Borho ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
