Show More
| @@ -501,7 +501,6 b' def histedit(ui, repo, *freeargs, **opts' | |||||
| 501 |
|
501 | |||
| 502 | if goal == 'continue': |
|
502 | if goal == 'continue': | |
| 503 | (parentctxnode, rules, keep, topmost, replacements) = readstate(repo) |
|
503 | (parentctxnode, rules, keep, topmost, replacements) = readstate(repo) | |
| 504 | currentparent, wantnull = repo.dirstate.parents() |
|
|||
| 505 | parentctx = repo[parentctxnode] |
|
504 | parentctx = repo[parentctxnode] | |
| 506 | parentctx, repl = bootstrapcontinue(ui, repo, parentctx, rules, opts) |
|
505 | parentctx, repl = bootstrapcontinue(ui, repo, parentctx, rules, opts) | |
| 507 | replacements.extend(repl) |
|
506 | replacements.extend(repl) | |
General Comments 0
You need to be logged in to leave comments.
Login now