Mercurial > public > mercurial-scm > hg

diff hgext/rebase.py @ 12896:b19b4c1df066 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: improve resolve failure message
author Steve Borho <steve@borho.org>
date Sat, 30 Oct 2010 16:58:15 -0500
parents 1c57a66bf985
children 6c800e7ef2f6
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Nov 01 10:24:07 2010 +0100
+++ b/hgext/rebase.py	Sat Oct 30 16:58:15 2010 -0500
@@ -165,8 +165,8 @@
                 else:
                     stats = rebasenode(repo, rev, p1, p2, state)
                     if stats and stats[3] > 0:
-                        raise util.Abort(_('fix unresolved conflicts with hg '
-                                    'resolve then run hg rebase --continue'))
+                        raise util.Abort(_('unresolved conflicts (see hg '
+                                    'resolve, then hg rebase --continue)'))
                 updatedirstate(repo, rev, target, p2)
                 if not collapsef:
                     newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)