--- a/hgext3rd/evolve/evolvecmd.py	Thu Jun 14 01:39:11 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Jun 14 01:39:33 2018 +0530
@@ -386,6 +386,17 @@
     otherp1 = other.p1().rev()
     divp1 = divergent.p1().rev()
 
+    # finding single successors of otherp1 and divp1
+    try:
+        otherp1 = utility._singlesuccessor(repo, other.p1())
+    except utility.MultipleSuccessorsError:
+        pass
+
+    try:
+        divp1 = utility._singlesuccessor(repo, divergent.p1())
+    except utility.MultipleSuccessorsError:
+        pass
+
     # the changeset on which resolution changeset will be based on
     resolutionparent = repo[divp1].node()