# HG changeset patch # User Simon Heimberg # Date 1390436468 -3600 # Node ID dcd65ce87260e55bd913966cdc2ea835ebaaf4e1 # Parent 268a5ab5c27bee4312c5f060cefab4de6cbdadba hgext: fix one typo in rebase diff -r 268a5ab5c27b -r dcd65ce87260 hgext/rebase.py --- 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) diff -r 268a5ab5c27b -r dcd65ce87260 tests/test-rebase-abort.t --- 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)