--- a/tests/test-divergent.t	Tue Feb 28 17:17:40 2017 +0100
+++ b/tests/test-divergent.t	Tue Feb 28 17:19:31 2017 +0100
@@ -99,14 +99,18 @@
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
-  $ hg evolve --all --any --divergent
-  merge:[7] add cdivergent1
-  with: [8] cdivergent2
-  base: [6] add _c
-  updating to "local" conflict
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 6602ff5a79dc
+## Fixed only for 3.5+
+#
+#  $ hg evolve --all --any --divergent
+#  merge:[7] add cdivergent1
+#  with: [8] cdivergent2
+#  base: [6] add _c
+#  updating to "local" conflict
+#  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+#  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+#  working directory is now at 6602ff5a79dc
+ 
+  $ cd ..  
 
 Test None docstring issue of evolve divergent, which caused hg crush