Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove redundant if
authorMatt Mackall <mpm@selenic.com>
Tue, 22 Aug 2006 17:42:55 -0500
changeset 2976 c67920d78248
parent 2975 31011730f9bd
child 2977 87a0332ab58b
merge: remove redundant if
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial