diff -r bc601c010185 -r cc3e68120185 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Sat Dec 13 18:09:23 2014 -0800 +++ b/tests/test-stabilize-conflict.t Sat Dec 13 18:19:12 2014 -0800 @@ -16,7 +16,6 @@ > touch.gui=true > touch.args=babar > [extensions] - > hgext.rebase= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH