Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext: fix one typo in rebase stable
authorSimon Heimberg <simohe@besonet.ch>
Thu, 23 Jan 2014 01:21:08 +0100
branchstable
changeset 20313 dcd65ce87260
parent 20312 268a5ab5c27b
child 20314 b396032e1bb8
hgext: fix one typo in rebase
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-abort.t file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Thu Jan 23 01:29:50 2014 +0100
+++ b/hgext/rebase.py	Thu Jan 23 01:21:08 2014 +0100
@@ -193,7 +193,7 @@
                     return 0
                 else:
                     msg = _('cannot continue inconsistent rebase')
-                    hint = _('use "hg rebase --abort" to clear borken state')
+                    hint = _('use "hg rebase --abort" to clear broken state')
                     raise util.Abort(msg, hint=hint)
             if abortf:
                 return abort(repo, originalwd, target, state)
--- a/tests/test-rebase-abort.t	Thu Jan 23 01:29:50 2014 +0100
+++ b/tests/test-rebase-abort.t	Thu Jan 23 01:21:08 2014 +0100
@@ -92,7 +92,7 @@
 
   $ hg rebase --continue
   abort: cannot continue inconsistent rebase
-  (use "hg rebase --abort" to clear borken state)
+  (use "hg rebase --abort" to clear broken state)
   [255]
   $ hg summary | grep '^rebase: '
   rebase: (use "hg rebase --abort" to clear broken state)
mercurial