Mercurial > hg
comparison mercurial/merge.py @ 23384:0791a10ad87c
merge: remove unused variables from _checkcollision()
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 24 Nov 2014 11:28:46 -0800 |
| parents | 90cc552ceed5 |
| children | 91c24457c16a |
comparison
equal
deleted
inserted
replaced
| 23382:a81c76106d90 | 23384:0791a10ad87c |
|---|---|
| 348 for f, args, msg in actions['dm']: | 348 for f, args, msg in actions['dm']: |
| 349 f2, flags = args | 349 f2, flags = args |
| 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 |
| 357 if move: | 356 if move: |
| 358 pmmf.discard(f1) | 357 pmmf.discard(f1) |