##// END OF EJS Templates
merge: remove unused variables from _checkcollision()
Martin von Zweigbergk -
r23384:0791a10a default
parent child Browse files
Show More
@@ -350,7 +350,6 b' def _checkcollision(repo, wmf, actions):'
350 pmmf.discard(f2)
350 pmmf.discard(f2)
351 pmmf.add(f)
351 pmmf.add(f)
352 for f, args, msg in actions['dg']:
352 for f, args, msg in actions['dg']:
353 f2, flags = args
354 pmmf.add(f)
353 pmmf.add(f)
355 for f, args, msg in actions['m']:
354 for f, args, msg in actions['m']:
356 f1, f2, fa, move, anc = args
355 f1, f2, fa, move, anc = args
General Comments 0
You need to be logged in to leave comments. Login now