http://bitbucket.org/tortoisehg/stable/changeset/03f5c5af8623/
was a non-trivial merge in history.py (manual resolve of a merge conflict). Please check if I did it correctly. (Yuki? :-) TIA ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
