Mercurial Mercurial > pub > hg > evolve / 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/evolve.py
branchstable
changeset 1753 9fd15f27c91c
parent 1752 19e32420e150
child 1754 c9ddc93eee67 
--- a/hgext/evolve.py	Fri Oct 28 17:03:53 2016 +0200
+++ b/hgext/evolve.py	Fri Oct 28 15:04:40 2016 -0700
@@ -1946,7 +1946,7 @@
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
                 _('fix conflict and run "hg evolve --continue"'
-                  ' or use "hg update -C" to abort\n'))
+                  ' or use "hg update -C ." to abort\n'))
             raise
 
 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
evolve