hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
adding aadding baNONEXISTENT: No such file or directoryaba: No such file or directoryNONEXISTENT: No such file or directorybaNONEXISTENT: No such file in rev 9e1684505872ab