diff hgext/evolve.py @ 1396:ba95cec18fe9

merge with stable

--- a/hgext/evolve.py	Thu Jun 18 23:45:37 2015 -0700
+++ b/hgext/evolve.py	Fri Jun 19 10:47:02 2015 -0700
@@ -20,7 +20,7 @@
 '''
 
 __version__ = '5.1.4'
-testedwith = '3.3.3 3.4-rc'
+testedwith = '3.3.3 3.4.1'
 buglink = 'http://bz.selenic.com/'
 
 import sys, os
@@ -1541,7 +1541,8 @@
             repo.opener.write('graftstate', orig.hex() + '\n')
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
-                _('fix conflict and run "hg evolve --continue"\n'))
+                _('fix conflict and run "hg evolve --continue"'
+                  ' or use "hg update -C" to abort\n'))
             raise
 
 def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,