[PATCH evolve-ext] relocate: fix typo
Faheem Mitha
faheem at faheem.info
Sun Aug 10 15:30:31 CDT 2014
# HG changeset patch
# User Faheem Mitha <faheem at faheem.info>
# Date 1407702429 -19800
# Mon Aug 11 01:57:09 2014 +0530
# Node ID 1eac86edc6c26a1951d83dac6208ad7ffec7fc25
# Parent d2fe19c818ea2e6a65e1fe99de699807270b49d4
relocate: fix typo
diff -r d2fe19c818ea -r 1eac86edc6c2 hgext/evolve.py
--- 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()
More information about the Mercurial-devel
mailing list