On Sat, Jan 9, 2010 at 12:29 AM, jose miguel hernandez <jmiguel.h...@gmail.com> wrote: > The only feature missing on tortoise merge is directory diffs, but i > think the diff window could solve that.
It seems to do two-way directory diffs just fine. I tested it yesterday. > 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. > Everyone could install the visual diff tool of preference, kdiff3 is > actually very easy to configure for mercurial as it is very popular > and the manuals for the config file use it as an example. > At work i use araxis merge by the way > > So if tortoisemerge is of smaller footprint an we make more people > happy, it is the perfect choice. > > My vote is, well, i don't care, i use araxis merge and i could > install kdiff3 if needed. I should also mention the implications of this from an upgrade perspective. If we package TortoiseMerge with the next stable release and you upgrade over an existing install, you will have both Kdiff3 and TortoiseMerge. Kdiff3 has a higher priority in the [merge-tools] config section, so it would still be used by default if the user did not select a tool. If we did make the switch, I would put links in the release notes to KDiff3's web page and to http://bitbucket.org/tortoisehg/thg-winbuild/src/0.9/contrib/kdiff3.exe so people could download either the latest package, or the version we were bundling in earlier releases. -- 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
