diff -r 38d106db75bc -r eb46971fc57f tests/test-up-local-change --- a/tests/test-up-local-change Sat Jul 02 20:51:33 2005 -0800 +++ b/tests/test-up-local-change Sat Jul 02 22:54:35 2005 -0800 @@ -26,8 +26,8 @@ cd ../r2 hg -q pull ../r1 hg status -hg -d up -hg -d up -m +hg --debug up +hg --debug up -m hg parents hg -v history hg diff > ../d