##// END OF EJS Templates
hgext: fix one typo in rebase
Simon Heimberg -
r20313:dcd65ce8 stable
parent child Browse files
Show More
@@ -193,7 +193,7 b' def rebase(ui, repo, **opts):'
193 return 0
193 return 0
194 else:
194 else:
195 msg = _('cannot continue inconsistent rebase')
195 msg = _('cannot continue inconsistent rebase')
196 hint = _('use "hg rebase --abort" to clear borken state')
196 hint = _('use "hg rebase --abort" to clear broken state')
197 raise util.Abort(msg, hint=hint)
197 raise util.Abort(msg, hint=hint)
198 if abortf:
198 if abortf:
199 return abort(repo, originalwd, target, state)
199 return abort(repo, originalwd, target, state)
@@ -92,7 +92,7 b' earlier than 2.7 by renaming ".hg/rebase'
92
92
93 $ hg rebase --continue
93 $ hg rebase --continue
94 abort: cannot continue inconsistent rebase
94 abort: cannot continue inconsistent rebase
95 (use "hg rebase --abort" to clear borken state)
95 (use "hg rebase --abort" to clear broken state)
96 [255]
96 [255]
97 $ hg summary | grep '^rebase: '
97 $ hg summary | grep '^rebase: '
98 rebase: (use "hg rebase --abort" to clear broken state)
98 rebase: (use "hg rebase --abort" to clear broken state)
General Comments 0
You need to be logged in to leave comments. Login now