rebase: improve resolve failure message

hgext/rebase.py

@@ -165,8 +165,8 b' def rebase(ui, repo, **opts):'
                 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)

tests/test-rebase-abort.t

@@ -50,7 +50,7 b' Conflicting rebase:'
   merging common
   warning: conflicts during merge.
   merging common failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Abort:
@@ -118,7 +118,7 b' Rebase and abort without generating new '
   merging c
   warning: conflicts during merge.
   merging c failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ hg tglog

tests/test-rebase-check-restore.t

@@ -64,7 +64,7 b' Rebasing B onto E - check keep:'
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -116,7 +116,7 b' Rebase F onto E - check keepbranches:'
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:

tests/test-rebase-conflicts.t

@@ -59,7 +59,7 b' Conflicting rebase:'
   merging common
   warning: conflicts during merge.
   merging common failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Try to continue without solving the conflict:

tests/test-rebase-interruptions.t

@@ -57,7 +57,7 b' Rebasing B onto E:'
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on C during the interruption:
@@ -89,7 +89,7 b' Resume the rebasing:'
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -143,7 +143,7 b' Rebasing B onto E:'
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on B' during the interruption:

tests/test-rebase-mq-skip.t

@@ -105,7 +105,7 b' already has one local mq patch'
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ HGMERGE=internal:local hg resolve --all

tests/test-rebase-mq.t

@@ -63,7 +63,7 b' Rebase - generate a conflict:'
   merging f
   warning: conflicts during merge.
   merging f failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Fix the 1st conflict:
@@ -74,7 +74,7 b' Fix the 1st conflict:'
   merging f
   warning: conflicts during merge.
   merging f failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Fix the 2nd conflict: