--- a/tests/test-evolve-content-divergent-stack.t	Mon Dec 30 00:11:00 2019 +0530
+++ b/tests/test-evolve-content-divergent-stack.t	Sun Dec 29 23:59:41 2019 +0530
@@ -997,11 +997,5 @@
   1 changesets pruned
 
   $ hg evolve --content-divergent
-  skipping 57a3f8edf065: have a different parent than 9a1f460df8b5 (not handled yet)
-  | 57a3f8edf065, 9a1f460df8b5 are not based on the same changeset.
-  | With the current state of its implementation, 
-  | evolve does not work in that case.
-  | rebase one of them next to the other and run 
-  | this command again.
-  | - either: hg rebase --dest 'p1(57a3f8edf065)' -r 9a1f460df8b5
-  | - or:     hg rebase --dest 'p1(9a1f460df8b5)' -r 57a3f8edf065
+  abort: ambiguous orphan resolution parent for 9a1f460df8b5
+  [255]