Allow specifying a custom merge type via an environment variable, $MERGE.
Try $MERGE if no other merge type is specified.
Return to the prompt after a merge, making it possible to abort if unsuccessful.