diff -r 2efa636eb411 -r e506c14382fd tests/test-hook
--- a/tests/test-hook	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-hook	Sun May 14 21:07:34 2006 -0700
@@ -29,7 +29,7 @@
 echo b > b
 hg add b
 hg commit -m b -d '1 0'
-hg update -m 1
+hg merge 1
 hg commit -m merge -d '2 0'
 
 cd ../b