Mercurial > hg

diff mercurial/commands.py @ 27487:4242d699de6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: reword help to use See help resolve
author timeless <timeless@mozdev.org>
date Tue, 22 Dec 2015 05:46:23 +0000
parents 9ebc02157bf3
children 0d1452d71317
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Dec 21 21:31:57 2015 -0800
+++ b/mercurial/commands.py	Tue Dec 22 05:46:23 2015 +0000
@@ -5164,7 +5164,7 @@
     head, the other head is merged with by default. Otherwise, an
     explicit revision with which to merge with must be provided.
 
-    :hg:`resolve` must be used to resolve unresolved files.
+    See :hg:`help resolve` for information on handling file conflicts.
 
     To undo an uncommitted merge, use :hg:`update --clean .` which
     will check out a clean copy of the original merge parent, losing