Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 42448 1314c0bb6b24
parent 42419 69883775b27d
child 42493 9f7cb777b654 
--- a/mercurial/commands.py	Mon Jun 10 15:35:06 2019 -0700
+++ b/mercurial/commands.py	Fri May 31 10:12:56 2019 -0700
@@ -3991,7 +3991,7 @@
     If no revision is specified, the working directory's parent is a
     head revision, and the current branch contains exactly one other
     head, the other head is merged with by default. Otherwise, an
-    explicit revision with which to merge with must be provided.
+    explicit revision with which to merge must be provided.
 
     See :hg:`help resolve` for information on handling file conflicts.
Mercurial