branch | stable |
changeset 23400 | 3bd577a3283e |
parent 23137 | 7867f15b4a38 |
child 23404 | b913c394386f |
child 23414 | 759202b64f49 |
--- a/mercurial/commands.py Tue Nov 25 18:37:28 2014 +0900 +++ b/mercurial/commands.py Wed Nov 26 17:22:09 2014 +0300 @@ -4535,7 +4535,7 @@ ] + 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.