--- a/tests/test-evolve-content-divergence.t	Mon Mar 04 02:55:38 2019 +0530
+++ b/tests/test-evolve-content-divergence.t	Mon Mar 04 03:16:51 2019 +0530
@@ -929,8 +929,8 @@
       () [default] draft
 
 
-Test which demonstrate that evolve can fall into unrecoverable state (issue6053):
----------------------------------------------------------------------------------
+Test to make sure that evolve don't fall into unrecoverable state (issue6053):
+------------------------------------------------------------------------------
   $ cd ..
   $ hg init localside
   $ cd localside
@@ -1016,17 +1016,13 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  update:[2] added c
-  abort: outstanding uncommitted merge
-  [255]
+  evolving 6:de4ea3103326 "updated e"
+  updating to "local" side of the conflict: ff6f7cd76a7c
+  merging "other" content-divergent changeset 'e504bd82de7e'
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory is now at 83b1664a580f
 
-  $ hg evolve --abort
-  update:[2] added c
-  abort: outstanding uncommitted merge
-  [255]
-
-  $ hg ci -m "merge commit"
-  abort: evolve in progress
-  (use 'hg evolve --continue' or 'hg evolve --abort' to abort)
-  [255]
-
+  $ hg glog -l1
+  @  8:83b1664a580f updated e
+  |   () [default] draft
+  ~