Mercurial > hg

changeset 7977:1cd3775e097c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: better merge help text
author Martin Geisler <mg@daimi.au.dk>
date Sat, 04 Apr 2009 17:33:42 +0200
parents a62fc8fe882f
children aa512a03f6d3
files mercurial/commands.py
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Apr 04 16:46:50 2009 +0200
+++ b/mercurial/commands.py	Sat Apr 04 17:33:42 2009 +0200
@@ -2003,10 +2003,13 @@
 def merge(ui, repo, node=None, force=None, rev=None):
     """merge working directory with another revision
 
-    Merge the contents of the current working directory and the
-    requested revision. Files that changed between either parent are
-    marked as changed for the next commit and a commit must be
-    performed before any further updates are allowed.
+    The contents of the current working directory is updated with all
+    changes made in the requested revision since the last common
+    predecessor revision.
+
+    Files that changed between either parent are marked as changed for
+    the next commit and a commit must be performed before any further
+    updates are allowed. The next commit has two parents.
 
     If no revision is specified, the working directory's parent is a
     head revision, and the current branch contains exactly one other head,