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

#header#
# HG changeset patch
# User #author#
# Date #date|date#
# Node ID #node#
#parent%changesetparent#
#desc#

#diff#