hgext/rebase.py
changeset 43874 c6feee1e4d5b
parent 43787 be8552f25cab
child 43899 fff21278554b
--- a/hgext/rebase.py	Wed Dec 11 19:42:05 2019 -0800
+++ b/hgext/rebase.py	Fri Dec 13 15:46:25 2019 -0800
@@ -1791,7 +1791,7 @@
     # But our merge base candidates (D and E in above case) could still be
     # better than the default (ancestor(F, Z) == null). Therefore still
     # pick one (so choose p1 above).
-    if sum(1 for b in bases if b != nullrev) > 1:
+    if sum(1 for b in set(bases) if b != nullrev) > 1:
         unwanted = [None, None]  # unwanted[i]: unwanted revs if choose bases[i]
         for i, base in enumerate(bases):
             if base == nullrev: