Allow specification of a custom merge type via an environment variable, $MERGE

The rationale for this is that I prefer to use Emacs ediff to do my merging, but there's no standard way to do this from outside of Emacs so I'm using my own wrapper script.