explicitly specify merge tool for hg merge test
explicitly specify merge tool for hg merge test

pypa/setuptools_scm,RonnyPfannschmidt/setuptools_scm,pypa/setuptools_scm,RonnyPfannschmidt/setuptools_scm