diff hgext/evolve.py @ 1753:9fd15f27c91c stable

evolve: suggest "hg update -C .", including '.', to abort evolve

The user will probably not also want to change commit when they abort
evolve, like "hg update -C" (without the '.') would do. Note that we
already do recommend aborting by using "hg update -C ." in another
place.

--- 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,