# HG changeset patch # User Martin von Zweigbergk # Date 1556042504 25200 # Node ID 5450c8069a37504ad4960a0a871cbd8aef3a97b4 # Parent 90cc85a82be7299ac3d4791880b148e0c0ca3540 evolve: remove a useless return statement at end of function diff -r 90cc85a82be7 -r 5450c8069a37 hgext3rd/evolve/evolvecmd.py --- 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."""