# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1434736022 25200
# Node ID ba95cec18fe9c809814865150fbc634897dd3deb
# Parent  35518d26b549861945b4c4fb688210bfed312df6# Parent  362e2c8c5677e49aa4fb8ef4e61d7ad133b3e5a5
merge with stable

diff -r 35518d26b549 -r ba95cec18fe9 hgext/evolve.py
--- 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,
diff -r 35518d26b549 -r ba95cec18fe9 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Thu Jun 18 23:45:37 2015 -0700
+++ b/tests/test-stabilize-conflict.t	Fri Jun 19 10:47:02 2015 -0700
@@ -130,7 +130,7 @@
   warning: conflicts during merge.
   merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
@@ -220,7 +220,7 @@
   was merge successful (yn)? n
   merging babar failed!
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
diff -r 35518d26b549 -r ba95cec18fe9 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Thu Jun 18 23:45:37 2015 -0700
+++ b/tests/test-stabilize-result.t	Fri Jun 19 10:47:02 2015 -0700
@@ -85,7 +85,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r 'unstable()' a