diff -r e8730b5b8a32 -r eb0b4a2d70a9 mercurial/merge.py
--- a/mercurial/merge.py	Thu Nov 16 08:52:55 2006 +0100
+++ b/mercurial/merge.py	Fri Nov 17 08:06:54 2006 +0100
@@ -133,7 +133,7 @@
     match = {}
     u1 = nonoverlap(m1, m2, ma)
     u2 = nonoverlap(m2, m1, ma)
-    ctx = util.cachefunc(lambda f,n: repo.filectx(f, fileid=n[:20]))
+    ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20]))
 
     def checkpair(c, f2, man):
         ''' check if an apparent pair actually matches '''
@@ -285,7 +285,7 @@
                 if inst.errno != errno.ENOENT:
                     repo.ui.warn(_("update failed to remove %s: %s!\n") %
                                  (f, inst.strerror))
-            removed +=1
+            removed += 1
         elif m == "m": # merge
             f2, fd, flag, move = a[2:]
             r = filemerge(repo, f, f2, wctx, mctx)