# HG changeset patch # User Matt Mackall # Date 1259207687 21600 # Node ID 2d0f1cde217b486cb497c4f60c0229ba7d633679 # Parent 2c7ea49d251211a76fc86168b14ca2bd1de7895c# Parent 251812d34c08ab7f1898d683f738123f78c6850e Merge with stable again diff -r 2c7ea49d2512 -r 2d0f1cde217b tests/run-tests.py