changeset 42533 | 0231032729c4 |
parent 42532 | 12243f15d53e |
child 42583 | b9bc47211cf5 |
--- a/hgext/rebase.py Sun Jun 09 02:12:58 2019 +0530 +++ b/hgext/rebase.py Thu Jun 20 11:40:08 2019 +0530 @@ -1950,6 +1950,5 @@ entry[1].append(('t', 'tool', '', _("specify merge tool for rebase"))) cmdutil.summaryhooks.add('rebase', summaryhook) - statemod.addunfinished('rebase', fname='rebasestate', stopflag=True) - cmdutil.afterresolvedstates.append( - ['rebasestate', _('hg rebase --continue')]) + statemod.addunfinished('rebase', fname='rebasestate', stopflag=True, + continueflag=True)