hgext/rebase.py
changeset 11204 54e93b86a9e3
parent 11203 7a9cf012dddc
child 11205 d26f662bfbf5
--- a/hgext/rebase.py	Thu May 20 15:15:11 2010 -0500
+++ b/hgext/rebase.py	Thu May 20 15:20:25 2010 -0500
@@ -427,7 +427,7 @@
     'Restore the repository to its original state'
     if set(repo.changelog.descendants(target)) - set(state.values()):
         repo.ui.warn(_("warning: new changesets detected on target branch, "
-                                                    "not stripping\n"))
+                                                    "can't abort\n"))
     else:
         # Strip from the first rebased revision
         merge.update(repo, repo[originalwd].rev(), False, True, False)