diff tests/test-evolve-public-content-divergent-main.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-main.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-evolve-public-content-divergent-main.t	Thu Sep 17 14:51:45 2020 +0530
@@ -94,7 +94,7 @@
   |   b
   |  +I am second
   |
-  %  2:44f360db368f added b
+  o  2:44f360db368f added b
   |   public
   |
   |  diff -r 9092f1db7931 -r 44f360db368f b
@@ -188,7 +188,7 @@
   @  5:4ae447c511d3 phase-divergent update to 580f2d01e52c:
   |   draft
   |
-  %  2:580f2d01e52c added b
+  o  2:580f2d01e52c added b
   |   public
   |
   o  0:9092f1db7931 added a