[PATCH 1 of 6] merge: remove unused variables from _checkcollision()
Martin von Zweigbergk
martinvonz at google.com
Tue Nov 25 05:22:47 UTC 2014
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1416857326 28800
# Mon Nov 24 11:28:46 2014 -0800
# Node ID 3b17ea6f8de746154a4e736277659aeb41095619
# Parent a81c76106d9036060b3371f36b00ceefa5d60898
merge: remove unused variables from _checkcollision()
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
More information about the Mercurial-devel
mailing list