[PATCH 2 of 3] commands: change rebase hint to point to resolve help

timeless at mozdev.org timeless at mozdev.org
Tue Sep 8 20:09:26 CDT 2015


# HG changeset patch
# User timeless at mozdev.org
# Date 1441748812 14400
#      Tue Sep 08 17:46:52 2015 -0400
# Node ID b8b8222bb2dc08088dd10a0191f2bcbaf94ecc40
# Parent  4e1590f55dbe54863ad1b3b7001ad7424e5203e4
commands: change rebase hint to point to resolve help

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -397,8 +397,9 @@
                                            collapsef, target)
                         if stats and stats[3] > 0:
                             raise error.InterventionRequired(
-                                _('unresolved conflicts (see hg '
-                                  'resolve, then hg rebase --continue)'))
+                                _('unresolved conflicts '
+                                  "(see 'hg help resolve', "
+                                  "then 'hg rebase --continue')"))
                     finally:
                         ui.setconfig('ui', 'forcemerge', '', 'rebase')
                 if not collapsef:


More information about the Mercurial-devel mailing list