changeset 22023 | f18830651811 |
parent 4363 | 2e3c54fb79a3 |
--- a/tests/test-simplemerge.py.out Tue Jul 29 11:55:01 2014 -0700 +++ b/tests/test-simplemerge.py.out Tue Aug 05 14:56:25 2014 -0700 @@ -1,5 +1,5 @@ -.................... +................ ---------------------------------------------------------------------- -Ran 20 tests in 0.000s +Ran 16 tests in 0.000s OK