Mercurial > hg
comparison mercurial/merge.py @ 14064:e4bfb9c337f3
remove unused imports and variables
| author | Alexander Solovyov <alexander@solovyov.net> |
|---|---|
| date | Sat, 30 Apr 2011 13:59:14 +0200 |
| parents | d1f4e7fd970a |
| children | 135e244776f0 |
comparison
equal
deleted
inserted
replaced
| 14063:87ebf72878ed | 14064:e4bfb9c337f3 |
|---|---|
| 269 updated, merged, removed, unresolved = 0, 0, 0, 0 | 269 updated, merged, removed, unresolved = 0, 0, 0, 0 |
| 270 ms = mergestate(repo) | 270 ms = mergestate(repo) |
| 271 ms.reset(wctx.p1().node()) | 271 ms.reset(wctx.p1().node()) |
| 272 moves = [] | 272 moves = [] |
| 273 action.sort(key=actionkey) | 273 action.sort(key=actionkey) |
| 274 substate = wctx.substate # prime | |
| 275 | 274 |
| 276 # prescan for merges | 275 # prescan for merges |
| 277 u = repo.ui | 276 u = repo.ui |
| 278 for a in action: | 277 for a in action: |
| 279 f, m = a[:2] | 278 f, m = a[:2] |