merge: add --tool argument to merge and resolve These arguments are shorthand for --config ui.merge, but they also override HGMERGE if it is found in the user's environment.