do not remove files on those merge tools, which does not return correct exit code
Allow specification of a custom merge type via an environment variable, $MERGE

inspired by mavit patch
https://github.com/xsuchy/rpmconf/pull/6/files
https://github.com/xsuchy/rpmconf/pull/7