Allow specifying a custom merge type via an environment variable, $MERGE.
Try $MERGE if no other merge type is specified.
For consistency, use [ rather than [[.
Use function validate_merge_type to check $MERGE is sensible.
Merge branch 'merge-from-environment'

Conflicts:
	source/rpmconf