Mercurial > hg-stable
changeset 20313:dcd65ce87260 stable
hgext: fix one typo in rebase
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Thu, 23 Jan 2014 01:21:08 +0100 |
| parents | 268a5ab5c27b |
| children | b396032e1bb8 |
| files | hgext/rebase.py tests/test-rebase-abort.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)