Mercurial > hg-stable
changeset 23386:8229f32d2b79
merge: remove dead assignment in applyupdates()
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 23 Nov 2014 23:10:34 -0800 |
| parents | 91c24457c16a |
| children | 3eb99f8e9a62 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)