On 18/10/2009, at 05:40, Steve Borho wrote: > I've merged the default branch onto the stable branch. The 0.9 > release will be based off of the stable branch after a couple of weeks > of bug fixes. Now would be an appropriate time to update the > translation texts as there should be very few string changes between > now and the release. There will be a hard string freeze on the 24th. > 0.9 is still planned for Nov. 1, but we may slide out our schedule if > Mercurial 1.4 is delayed. We'll try to release on the same day, if > possible.
Since 1.4 will include extdiff 3-way we should (despite the feature freeze) at least change "our" (not implying ownership) visdiff code. supporting full 3-way is a mouthfull, but we should support and respect the $parent1, $parent2 and $child tags. We'll just not use $parent2, then, which is ok (it says in extdiff that if you use $parent2, the diff program _must_ handle the argument being left out, for 2-way mode). I can make a patch ASAP. /Sune ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
