--- a/mercurial/merge.py	Sun Sep 17 16:13:03 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 16:13:34 2006 -0500
@@ -203,8 +203,6 @@
     action = []
 
     # update m1 from working dir
-    umap = dict.fromkeys(unknown)
-
     for i,l in (("a", added), ("m", modified), ("u", unknown)):
         for f in l:
             m1[f] = m1.get(f, nullid) + i