# HG changeset patch # User Faheem Mitha # Date 1407702429 -19800 # Node ID ac47c2f774a82878e4fcc529332dd46d5012e40e # Parent d265efad02ccad7dacf50e46cfbae18b0ed72b1d relocate: fix typo diff --git a/hgext/evolve.py b/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()