added external diff tool diffmerge to mercurial