hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
removing bthis update spans a branch affecting the following files: baborting update spanning branches!(use update -m to merge across branches or -C to lose changes)