branch | mercurial-4.0 |
changeset 2109 | 90ab79764ce4 |
parent 1794 | e35667b01e1e |
parent 1806 | 9f42f819267b |
child 2701 | 26ec0839865b |
--- a/tests/test-stabilize-conflict.t Tue Feb 28 17:00:17 2017 +0100 +++ b/tests/test-stabilize-conflict.t Tue Mar 14 14:38:10 2017 -0700 @@ -17,7 +17,7 @@ > touch.args=babar > [extensions] > EOF - $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH + $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ safesed() { > sed "$1" "$2" > `pwd`/sed.temp