diff -r 2efa636eb411 -r e506c14382fd tests/test-excessive-merge
--- a/tests/test-excessive-merge	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-excessive-merge	Sun May 14 21:07:34 2006 -0700
@@ -17,12 +17,12 @@
 echo blah > b
 
 hg ci -m "branch b" -d "1000000 0"
-HGMERGE=true hg up -m 1
+HGMERGE=true hg merge 1
 
 hg ci -m "merge b/a -> blah" -d "1000000 0"
 
 hg co 1
-HGMERGE=true hg up -m 2
+HGMERGE=true hg merge 2
 hg ci -m "merge a/b -> blah" -d "1000000 0"
 
 hg log
@@ -43,4 +43,4 @@
 
 hg debugindex .hg/data/a.i
 
-hg verify
\ No newline at end of file
+hg verify