--- a/tests/test-merge6	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-merge6	Sun May 14 21:07:34 2006 -0700
@@ -33,14 +33,14 @@
 
 cd A1
 hg pull ../B1
-hg update -m
+hg merge
 hg commit -m "commit test" -d "1000000 0"
 echo bar should remain deleted.
 hg manifest
 
 cd ../B2
 hg pull ../A2
-hg update -m
+hg merge
 hg commit -m "commit test" -d "1000000 0"
 echo bar should remain deleted.
 hg manifest