diff -r 5c0dc243fe5b -r 57479e0d203d hgext/histedit.py
--- a/hgext/histedit.py	Tue Oct 01 10:44:59 2013 -0700
+++ b/hgext/histedit.py	Tue Oct 01 17:00:03 2013 -0700
@@ -641,8 +641,7 @@
             # `parentctxnode` should match but no result. This means that
             # currentnode is not a descendant from parentctxnode.
             msg = _('%s is not an ancestor of working directory')
-            hint = _('update to %s or descendant and run "hg histedit '
-                     '--continue" again') % parentctx
+            hint = _('use "histedit --abort" to clear broken state')
             raise util.Abort(msg % parentctx, hint=hint)
         newchildren.pop(0)  # remove parentctxnode
     # Commit dirty working directory if necessary