changeset 12743 | 4c4aeaab2339 |
parent 12484 | 59012130b43e |
child 12757 | 62c8f7691bc3 |
--- a/tests/test-rename-merge2.t Sun Oct 17 04:14:06 2010 +0200 +++ b/tests/test-rename-merge2.t Sat Oct 16 18:09:01 2010 +0200 @@ -66,8 +66,8 @@ > cp rev $1 > hg add $1 2> /dev/null > if [ "$2" != "" ] ; then - > cp rev $2 - > hg add $2 2> /dev/null + > cp rev $2 + > hg add $2 2> /dev/null > fi > } $ uc() { up $1; hg cp $1 $2; } # update + copy