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 9030 3f56055ff1d7
parent 8814 ab668c92a036
child 9048 86b4a9b0ddda 
--- 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:
mercurial