# HG changeset patch # User Benoit Boissinot # Date 1264355052 -3600 # Node ID 21b3346ce3c7b6b1ee2d996bc952f6bd298be367 # Parent 6134adc1c431b67d9192c00f2842cc04dfffc337# Parent 1c4ab236ebcbb2602a3e77c32796a29db2a227c4 merge with stable diff -r 6134adc1c431 -r 21b3346ce3c7 tests/test-encode --- a/tests/test-encode Sat Jan 23 16:55:46 2010 +0100 +++ b/tests/test-encode Sun Jan 24 18:44:12 2010 +0100 @@ -4,11 +4,11 @@ cat > .hg/hgrc <