pick: reduce configoverride() scope Merge tool is only needed for merge.graft() (it's what graft in core hg does), so let's make the scope of the ui.configoverride() narrower.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t