tests/test-evolve-abort-contentdiv.t
changeset 3839 ac0717f23921
parent 3832 fb821ed44f86
child 3841 82b79a8dafd9
--- a/tests/test-evolve-abort-contentdiv.t	Tue Jun 12 13:58:14 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Wed Jun 06 04:29:05 2018 +0530
@@ -81,6 +81,22 @@
   abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
   [255]
 
+  $ hg status -v
+  M d
+  # The repository is in an unfinished *evolve* state.
+  
+  # Unresolved merge conflicts:
+  # 
+  #     d
+  # 
+  # To mark files as resolved:  hg resolve --mark FILE
+  
+  # To continue:    hg evolve --continue
+  # To abort:       hg evolve --abort
+  # To stop:        hg evolve --stop
+  # (also see `hg help evolve.interrupted`)
+  
+
   $ hg evolve --abort
   evolve aborted
   working directory is now at 9c1631e352d9