hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
Metadata-Version: 1.0
Name: mercurial
Version: 0.7
Summary: scalable distributed SCM
Home-page: http://selenic.com/mercurial
Author: Matt Mackall
Author-email: mpm@selenic.com
License: GNU GPL
Description: UNKNOWN
Platform: UNKNOWN