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
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.