diff --git a/tests/test-flags b/tests/test-flags
--- a/tests/test-flags
+++ b/tests/test-flags
@@ -13,7 +13,7 @@ mkdir test2
 cd test2
 
 hg init
-hg merge ../test1
+hg pull ../test1
 hg co
 chmod +x a
 hg ci -t "chmod +x a" -u test -d "0 0"
@@ -22,7 +22,7 @@ cd ../test1
 echo 123 >>a
 hg ci -t "a updated" -u test -d "0 0"
 
-hg merge ../test2
+hg pull ../test2
 hg heads
 hg history
 
diff --git a/tests/test-help.out b/tests/test-help.out
--- a/tests/test-help.out
+++ b/tests/test-help.out
@@ -14,11 +14,11 @@ hg commands:
  help        show help for a given command or all commands
  history     show the changelog history
  identify    print information about the working copy
+ import      import an ordered set of patches
  init        create a new repository or copy an existing one
  log         show the revision history of a single file
  manifest    output the latest or given revision of the project manifest
  parents     show the parents of the current working dir
- patch       import an ordered set of patches
  pull        pull changes from the specified source
  push        push changes to the specified destination
  rawcommit   raw commit interface
@@ -63,11 +63,11 @@ hg commands:
  help        show help for a given command or all commands
  history     show the changelog history
  identify    print information about the working copy
+ import      import an ordered set of patches
  init        create a new repository or copy an existing one
  log         show the revision history of a single file
  manifest    output the latest or given revision of the project manifest
  parents     show the parents of the current working dir
- patch       import an ordered set of patches
  pull        pull changes from the specified source
  push        push changes to the specified destination
  rawcommit   raw commit interface