--- 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