Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 23405:2a038deeac9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: 0 is a valid ancestor different from None Most internal functions can take either a hash or an integer. Merge did however not handle 0 as revision 0. Now it does.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 30 Nov 2014 19:26:53 +0100
parents 9da5a7413eb8
children cd9e5e57064d
line wrap: on
line diff
--- 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: