# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1416857326 28800
# Node ID 0791a10ad87c8b0ac8088ff5c9dc4d9dc9283c60
# Parent  a81c76106d9036060b3371f36b00ceefa5d60898
merge: remove unused variables from _checkcollision()

diff -r a81c76106d90 -r 0791a10ad87c mercurial/merge.py
--- 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