# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1559981377 -28800
# Node ID 36c2bac8cab36de800758f4fd8485e5c6d00afa1
# Parent  b734a0085fe29440dfb6db1023e25ef855060834
evolve: correct action verb in a message

diff -r b734a0085fe2 -r 36c2bac8cab3 CHANGELOG
--- a/CHANGELOG	Sat Jun 08 16:06:24 2019 +0800
+++ b/CHANGELOG	Sat Jun 08 16:09:37 2019 +0800
@@ -5,6 +5,7 @@
 -------------------
 
   * evolve: use the same wording as core in case of unresolved conflict
+  * evolve: minor output message improvements
 
 9.0.0 -- 2019-06-06
 -------------------
diff -r b734a0085fe2 -r 36c2bac8cab3 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Sat Jun 08 16:06:24 2019 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Sat Jun 08 16:09:37 2019 +0800
@@ -1667,7 +1667,7 @@
         return
     elif abortopt:
         if not evolvestate:
-            raise error.Abort(_('no interrupted evolve to stop'))
+            raise error.Abort(_('no interrupted evolve to abort'))
         evolvestate.load()
         # `hg next --evolve` in play
         if evolvestate['command'] != 'evolve':
diff -r b734a0085fe2 -r 36c2bac8cab3 tests/test-evolve-abort-orphan.t
--- a/tests/test-evolve-abort-orphan.t	Sat Jun 08 16:06:24 2019 +0800
+++ b/tests/test-evolve-abort-orphan.t	Sat Jun 08 16:09:37 2019 +0800
@@ -42,7 +42,7 @@
 =============================================
 
   $ hg evolve --abort
-  abort: no interrupted evolve to stop
+  abort: no interrupted evolve to abort
   [255]
 
 Testing with wrong combination of flags