hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
requesting all changesabort: error: Connection refused255ls: copy: No such file or directoryrequesting all changesabort: HTTP Error 404: File not found255