On Wed, Jan 13, 2010 at 8:02 AM, Sune Foldager <sune.folda...@me.com> wrote: > After having tried out TortoiseMerge a bit (me and two co-workers), we > have a few issues at least (- and +): > > - Esc quits the application without warning :-p
This is a command line option (/x I think) and can be disabled. > - I really like the '4-way merge' kdiff3 does, where the ancestor is > separate. I assume it's identical to merge output in TortoiseMerge. > This makes it much easier to make mistakes IMO. I assume you meant the 3-pane approach makes it easier to make mistakes. > - The app is ugly, although not in all ways as ugly as kdiff3. The most > recent look possible is VS2005.. we're in 2010 now. > - Keyboard navigation is not optimal... there are several problems > using ctrl+f9 and f10 (theirs/mine). > - There are issues where you select 'mine' but get ancestor instead. > - Sometimes hunks are merged when you move to another hunk and then go > back. Sometimes one of the merged hunk is a 'deleted ancestor' hunk, > and you will now be unable to select a particular version without > getting the original ancestor text as well! Ouch. > + The editor has undo; this is missing from kdiff3 :( > > In short: I don't think this tool is mature enough by far. FWIW: the lack of three-way file comparisons has put a hold on TortoiseMerge's consideration for replacing KDiff3. The only other merge/diff tool on Windows that is free for redistribution (and not open source) is Source Gear's DiffMerge[1]. And it doesn't appear to have any special features that would encourage me to replace kdiff3 with it. -- Steve Borho [1] http://www.sourcegear.com/diffmerge/ ------------------------------------------------------------------------------ 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