# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1156286575 18000
# Node ID c67920d78248465ef9c4ffaca8f1b97135a46c3d
# Parent  31011730f9bd574891ea8380d554bf1975f451eb
merge: remove redundant if

diff -r 31011730f9bd -r c67920d78248 mercurial/merge.py
--- a/mercurial/merge.py	Tue Aug 22 17:26:44 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 22 17:42:55 2006 -0500
@@ -123,8 +123,7 @@
         m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))
 
     for f in deleted + removed:
-        if f in m1:
-            del m1[f]
+        del m1[f]
 
         # If we're jumping between revisions (as opposed to merging),
         # and if neither the working directory nor the target rev has