diff -r 91c24457c16a -r 8229f32d2b79 mercurial/merge.py
--- 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)