D3517: shelve: reduce scope of merge tool config override

[yuja (Yuya Nishihara)]

yuja added a comment.


  >   > > +        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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3517

To: martinvonz, #hg-reviewers
Cc: yuja, mercurial-devel