Mercurial > hg
diff mercurial/ancestor.py @ 12401:4cdaf1adafc8
backout most of 4f8067c94729
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 24 Sep 2010 12:46:54 -0500 |
parents | 4f8067c94729 |
children | 22565ddb28e7 |
line wrap: on
line diff
--- a/mercurial/ancestor.py Fri Sep 24 12:00:55 2010 +0200 +++ b/mercurial/ancestor.py Fri Sep 24 12:46:54 2010 -0500 @@ -34,7 +34,7 @@ visit.pop() else: for p in pl: - if p in (a, b): # did we find a or b as a parent? + if p == a or p == b: # did we find a or b as a parent? return p # we're done if p not in depth: visit.append(p)