hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

Context-type: #mimetype#
Content-disposition: filename=#file#

#raw#