--- a/tests/test-globalopts.out
+++ b/tests/test-globalopts.out
@@ -141,7 +141,7 @@ list of commands (use "hg help -v" to sh
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
- merge        Merge working directory with another revision
+ merge        merge working directory with another revision
  outgoing     show changesets not found in destination
  parents      show the parents of the working dir or revision
  paths        show definition of symbolic path names
@@ -160,7 +160,7 @@ list of commands (use "hg help -v" to sh
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply a changegroup file
- update       update or merge working directory
+ update       update working directory
  verify       verify the integrity of the repository
  version      output version and copyright information
 Mercurial Distributed SCM
@@ -191,7 +191,7 @@ list of commands (use "hg help -v" to sh
  locate       locate files matching specific patterns
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
- merge        Merge working directory with another revision
+ merge        merge working directory with another revision
  outgoing     show changesets not found in destination
  parents      show the parents of the working dir or revision
  paths        show definition of symbolic path names
@@ -210,7 +210,7 @@ list of commands (use "hg help -v" to sh
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply a changegroup file
- update       update or merge working directory
+ update       update working directory
  verify       verify the integrity of the repository
  version      output version and copyright information
 %% not tested: --debugger