Patchwork [STABLE] hgext: fix one typo in rebase

login
register
mail settings
Submitter Simon Heimberg
Date Jan. 23, 2014, 12:25 a.m.
Message ID <47511b006e57dc5c50a3.1390436730@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/3400/
State Accepted
Commit dcd65ce87260e55bd913966cdc2ea835ebaaf4e1
Headers show

Comments

Simon Heimberg - Jan. 23, 2014, 12:25 a.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1390436468 -3600
# Branch stable
# Node ID 47511b006e57dc5c50a361d40c35e1a03241a907
# Parent  d6b7673eafe373dd499c2a108d6dba01726792ce
hgext: fix one typo in rebase
Matt Mackall - Jan. 23, 2014, 8:29 p.m.
On Thu, 2014-01-23 at 01:25 +0100, Simon Heimberg wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1390436468 -3600
> # Branch stable
> # Node ID 47511b006e57dc5c50a361d40c35e1a03241a907
> # Parent  d6b7673eafe373dd499c2a108d6dba01726792ce
> hgext: fix one typo in rebase

Queued for stable, nice catch.

Patch

diff -r d6b7673eafe3 -r 47511b006e57 hgext/rebase.py
--- a/hgext/rebase.py	Don Jan 23 01:21:08 2014 +0100
+++ b/hgext/rebase.py	Don 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)