--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -29,7 +29,7 @@ hg --debug up
hg parents
hg --debug up 0
hg parents
-hg --debug up -m || echo failed
+hg --debug merge || echo failed
hg parents
hg --debug up
hg parents
@@ -50,8 +50,8 @@ hg -q pull ../r1
hg status
hg parents
hg --debug up || echo failed
-hg --debug up -m || echo failed
-hg --debug up -f -m
+hg --debug merge || echo failed
+hg --debug merge -f
hg parents
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"