Mercurial > hg

diff mercurial/merge.py @ 9030:3f56055ff1d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: can't compare two values of unequal datatypes
author Alejandro Santos <alejolp@alejolp.com>
date Sun, 05 Jul 2009 11:01:01 +0200
parents ab668c92a036
children 86b4a9b0ddda
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Jul 05 11:00:44 2009 +0200
+++ b/mercurial/merge.py	Sun Jul 05 11:01:01 2009 +0200
@@ -288,7 +288,7 @@
                 continue
             f2, fd, flags, move = a[2:]
             r = ms.resolve(fd, wctx, mctx)
-            if r > 0:
+            if r is not None and r > 0:
                 unresolved += 1
             else:
                 if r is None: