Patchwork [1,of,6] merge: remove unused variables from _checkcollision()

login
register
mail settings
Submitter Martin von Zweigbergk
Date Nov. 25, 2014, 5:22 a.m.
Message ID <3b17ea6f8de746154a4e.1416892967@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6845/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Nov. 25, 2014, 5:22 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1416857326 28800
#      Mon Nov 24 11:28:46 2014 -0800
# Node ID 3b17ea6f8de746154a4e736277659aeb41095619
# Parent  a81c76106d9036060b3371f36b00ceefa5d60898
merge: remove unused variables from _checkcollision()

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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