diff tests/test-evolve-public-content-divergent-corner-cases.t @ 5539:452651e69848 stable

evolvecmd: don't set `branchmerge=True` while resolving phase divergence

We are not going to create a merge commit, neither we are using two parents in
any way.

I am unable to see any reason why `branchmerge` should be passed as `True` here.

Passing branchmerge as True leads to side effect of having merge related commit
information stored in mergestate which leads us to having an active mergestate.

--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Sep 17 14:51:45 2020 +0530
@@ -151,7 +151,7 @@
   |   c
   |  +cc
   |
-  %  4:c0d7ee6604ea added c
+  o  4:c0d7ee6604ea added c
   |   public
   |
   |  diff -r c9241b0f2d5b -r c0d7ee6604ea c