diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4535,7 +4535,7 @@ def manifest(ui, repo, node=None, rev=No
] + mergetoolopts,
_('[-P] [-f] [[-r] REV]'))
def merge(ui, repo, node=None, **opts):
- """merge working directory with another revision
+ """merge another revision into working directory
The current working directory is updated with all changes made in
the requested revision since the last common predecessor revision.
diff --git a/tests/test-alias.t b/tests/test-alias.t
--- a/tests/test-alias.t
+++ b/tests/test-alias.t
@@ -443,7 +443,7 @@ invalid global arguments for normal comm
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -469,7 +469,7 @@ invalid global arguments for normal comm
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -495,7 +495,7 @@ invalid global arguments for normal comm
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -68,7 +68,7 @@ typical client does not want echo-back m
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -315,7 +315,7 @@ Testing -h/--help:
init create a new repository in the given directory
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 another revision into working directory
outgoing show changesets not found in the destination
paths show aliases for remote repositories
phase set or show the current phase name
@@ -396,7 +396,7 @@ Testing -h/--help:
init create a new repository in the given directory
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 another revision into working directory
outgoing show changesets not found in the destination
paths show aliases for remote repositories
phase set or show the current phase name
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -14,7 +14,7 @@ Short help:
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -35,7 +35,7 @@ Short help:
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -78,7 +78,7 @@ Short help:
init create a new repository in the given directory
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 another revision into working directory
outgoing show changesets not found in the destination
paths show aliases for remote repositories
phase set or show the current phase name
@@ -153,7 +153,7 @@ Short help:
init create a new repository in the given directory
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 another revision into working directory
outgoing show changesets not found in the destination
paths show aliases for remote repositories
phase set or show the current phase name
@@ -293,7 +293,7 @@ Test short command list with verbose opt
forget forget the specified files on the next commit
init create a new repository in the given directory
log, history show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove, rm remove the specified files on the next commit
@@ -599,7 +599,7 @@ Test command without options
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
@@ -694,7 +694,7 @@ Test that default list of commands omits
init create a new repository in the given directory
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 another revision into working directory
outgoing show changesets not found in the destination
paths show aliases for remote repositories
phase set or show the current phase name
@@ -1362,7 +1362,7 @@ Dish up an empty repo; serve it cold.
merge
|
- merge working directory with another revision
+ merge another revision into working directory
|
|
diff --git a/tests/test-strict.t b/tests/test-strict.t
--- a/tests/test-strict.t
+++ b/tests/test-strict.t
@@ -28,7 +28,7 @@
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
|