hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
%% no changes%% no changes%% uncompressed contents in repothis is a test%% uncompress our working dir copythis is a test%% uncompress our new working dir copythis is a test