Mercurial > hg > evolve

changeset 1148:ac47c2f774a8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relocate: fix typo
author Faheem Mitha <faheem@faheem.info>
date Mon, 11 Aug 2014 01:57:09 +0530
parents d265efad02cc
children bfa9d535f436
files hgext/evolve.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -852,7 +852,7 @@
     if not orig.p2().rev() == node.nullrev:
         raise util.Abort(
             'no support for evolving merge changesets yet',
-            hint="Redo the merge a use `hg prune` to obsolete the old one")
+            hint="Redo the merge and use `hg prune` to obsolete the old one")
     destbookmarks = repo.nodebookmarks(dest.node())
     nodesrc = orig.node()
     destphase = repo[nodesrc].phase()