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 dead assignment in applyupdates()
authorMartin von Zweigbergk <martinvonz@google.com>
Sun, 23 Nov 2014 23:10:34 -0800
changeset 23386 8229f32d2b79
parent 23385 91c24457c16a
child 23387 3eb99f8e9a62
merge: remove dead assignment in applyupdates()
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri Nov 21 13:06:04 2014 -0800
+++ b/mercurial/merge.py	Sun Nov 23 23:10:34 2014 -0800
@@ -762,7 +762,6 @@
         repo.ui.debug(" %s: %s -> m\n" % (f, msg))
         z += 1
         progress(_updating, z, item=f, total=numupdates, unit=_files)
-        f1, f2, fa, move, anc = args
         if f == '.hgsubstate': # subrepo states need updating
             subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
                              overwrite)
Mercurial