tests/test-confused-revert
changeset 2283 e506c14382fd
parent 2214 6c6c0e5595a2
child 2965 890e285c52a1
--- a/tests/test-confused-revert
+++ b/tests/test-confused-revert
@@ -28,7 +28,7 @@ hg co -C 0
 echo foo-b > a
 hg commit -m "2b" -d "1000000 0"
 
-HGMERGE=true hg update -m 1
+HGMERGE=true hg merge 1
 
 echo "%%% should show foo-b"
 cat a