author | Martin von Zweigbergk <martinvonz@google.com> |
Tue, 23 Apr 2019 11:01:44 -0700 | |
changeset 4588 | 5450c8069a37 |
parent 4587 | 90cc85a82be7 |
child 4589 | 5ba885e2ef5e |
--- a/hgext3rd/evolve/evolvecmd.py Sun Apr 21 13:04:40 2019 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Tue Apr 23 11:01:44 2019 -0700 @@ -1964,7 +1964,6 @@ lastsolved = newnode[1] else: evolvestate['skippedrevs'].append(curctx.node()) - return def _continuecontentdivergent(ui, repo, evolvestate, progresscb): """function to continue the interrupted content-divergence resolution."""