Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 23405 2a038deeac9a
parent 23398 9da5a7413eb8
child 23410 cd9e5e57064d 
--- a/mercurial/merge.py	Thu Nov 27 12:25:01 2014 -0600
+++ b/mercurial/merge.py	Sun Nov 30 19:26:53 2014 +0100
@@ -968,7 +968,7 @@
         pl = wc.parents()
         p1 = pl[0]
         pas = [None]
-        if ancestor:
+        if ancestor is not None:
             pas = [repo[ancestor]]
 
         if node is None:
mercurial