branch | stable |
changeset 1185 | cc3e68120185 |
parent 1167 | a1f5a948420d |
child 1188 | 0c879e986ce4 |
--- 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