tests/test-stabilize-conflict.t
branchstable
changeset 1185 cc3e68120185
parent 1167 a1f5a948420d
child 1188 0c879e986ce4
equal deleted inserted replaced
1184:bc601c010185 1185:cc3e68120185
    14   > [merge-tools]
    14   > [merge-tools]
    15   > touch.checkchanged=true
    15   > touch.checkchanged=true
    16   > touch.gui=true
    16   > touch.gui=true
    17   > touch.args=babar
    17   > touch.args=babar
    18   > [extensions]
    18   > [extensions]
    19   > hgext.rebase=
       
    20   > EOF
    19   > EOF
    21   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
    20   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
    22 
    21 
    23   $ safesed() {
    22   $ safesed() {
    24   >   sed "$1" "$2" > `pwd`/sed.temp
    23   >   sed "$1" "$2" > `pwd`/sed.temp