Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove unused variables from _checkcollision()
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 24 Nov 2014 11:28:46 -0800
changeset 23384 0791a10ad87c
parent 23382 a81c76106d90
child 23385 91c24457c16a
merge: remove unused variables from _checkcollision()
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Sat Nov 22 17:09:04 2014 -0600
+++ b/mercurial/merge.py	Mon Nov 24 11:28:46 2014 -0800
@@ -350,7 +350,6 @@
             pmmf.discard(f2)
             pmmf.add(f)
         for f, args, msg in actions['dg']:
-            f2, flags = args
             pmmf.add(f)
         for f, args, msg in actions['m']:
             f1, f2, fa, move, anc = args
mercurial