On Mon, Jan 11, 2010 at 1:15 AM, Peer Sommerlund <peer.sommerl...@gmail.com> wrote: > > > 2010/1/9 Steve Borho <st...@borho.org> >> >> On Sat, Jan 9, 2010 at 12:29 AM, jose miguel hernandez >> <jmiguel.h...@gmail.com> wrote: >> > I think it is just a matter of how many users like tortoise merge, it >> > might be useful to do a poll or something. >> >> Consider this thread the poll. >> > > My vote for switching to TortoiseMerge: +1 > There are some probably a few minor subversion things left over, which could > be hacked to work with mercurial. My 60 second test drive found the "mark as > resolved in subversion" button/menu item. Not a big issue, though. > Maybe we could even ask upstream for a command-line switch > (--no-subversion-features) that disabled this feature. Or, maybe > --resolve-command "hg resolve -m $filename" --resolve-help-text "Mark file > as resolved in Mercurial" )
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. -- 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
