Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 10436 6cebf27287de
parent 10413 e433002acb05
child 10628 6227c8d669d5
child 10646 86dc21148bdb 
--- a/hgext/rebase.py	Fri Feb 12 16:04:00 2010 +0100
+++ b/hgext/rebase.py	Fri Feb 12 15:17:10 2010 +0100
@@ -169,8 +169,8 @@
             rebased = [rev for rev in state if state[rev] != nullmerge]
             if rebased:
                 if set(repo.changelog.descendants(min(rebased))) - set(state):
-                    ui.warn(_("warning: new changesets detected on source branch, "
-                                                            "not stripping\n"))
+                    ui.warn(_("warning: new changesets detected "
+                              "on source branch, not stripping\n"))
                 else:
                     repair.strip(ui, repo, repo[min(rebased)].node(), "strip")
Mercurial