# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-09-17 21:13:34
# Node ID 4ec28446fca85eb41de5803f7c22de8696e3eea3
# Parent  7c7469d41adecfebf71c6699ea37a70b945c266d

merge: remove now unused umap dict

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -203,8 +203,6 @@ def update(repo, node, branchmerge=False
     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