Mercurial > hg-stable

changeset 3106:4ec28446fca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove now unused umap dict
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:13:34 -0500
parents 7c7469d41ade
children 3bd05ad67f45
files mercurial/merge.py
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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