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