[PATCH 1 of 3] commands: change graft hint to point to resolve help
timeless at mozdev.org
timeless at mozdev.org
Wed Sep 9 01:09:25 UTC 2015
# HG changeset patch
# User timeless at mozdev.org
# Date 1441748779 14400
# Tue Sep 08 17:46:19 2015 -0400
# Node ID 4e1590f55dbe54863ad1b3b7001ad7424e5203e4
# Parent 7187f6e923d55cf6b7e6910d24645f303db671ee
commands: change graft hint to point to resolve help
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3621,7 +3621,7 @@
repo.vfs.write('graftstate', ''.join(nodelines))
raise util.Abort(
_("unresolved conflicts, can't continue"),
- hint=_('use hg resolve and hg graft --continue'))
+ hint=_("see 'hg help resolve' then 'hg graft --continue'"))
else:
cont = False
More information about the Mercurial-devel
mailing list