Patchwork [1,of,4] merge: reword help to use See help resolve

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 22, 2015, 6:15 a.m.
Message ID <8f6f1280708fb05095d6.1450764952@waste.org>
Download mbox | patch
Permalink /patch/12231/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 22, 2015, 6:15 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450763183 0
#      Tue Dec 22 05:46:23 2015 +0000
# Node ID 8f6f1280708fb05095d63cfd0b96779de68b6f30
# Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
merge: reword help to use See help resolve

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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