mercurial/ancestor.py
changeset 12387 4f8067c94729
parent 11418 67bb9d78f05e
child 12401 4cdaf1adafc8
--- a/mercurial/ancestor.py	Thu Sep 23 10:59:21 2010 +0200
+++ b/mercurial/ancestor.py	Thu Sep 23 00:02:31 2010 -0500
@@ -34,7 +34,7 @@
             visit.pop()
         else:
             for p in pl:
-                if p == a or p == b: # did we find a or b as a parent?
+                if p in (a, b): # did we find a or b as a parent?
                     return p # we're done
                 if p not in depth:
                     visit.append(p)