Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 23404:b913c394386f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Nov 2014 12:25:01 -0600
parents 1cbc00ff2373 3bd577a3283e
children 19ebd2f88fc7
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Nov 11 20:32:10 2014 -0800
+++ b/mercurial/commands.py	Thu Nov 27 12:25:01 2014 -0600
@@ -4524,7 +4524,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.