tests: use --tool flag instead of --config ui.merge

Makes this test not fail on older hg versions.

--HG-- branch : stable

Merge request reports

Loading