D3517: shelve: reduce scope of config override

[Yuya Nishihara]

>   > > +        shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
>   > >  +                                          basename, pctx, tmpwctx,
>   > >  +                                          shelvectx, branchtorestore,
>   > >  +                                          activebookmark)
>   > > 
>   > >   overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
>   > >   with ui.configoverride(overrides, 'unshelve'):
>   >
>   > Maybe I'm wrong, but doesn't rebase do merge?
>   
>   
>   Correct, but we seem to be passing the tool explicitly to the rebase command on line 755.

Right. Queued this, thanks.