diff -r 0001e49f1c11 -r 3f56055ff1d7 mercurial/merge.py
--- 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: