--merge-conf. With this option yum will ask what to do with the configuration files changed with a package update.
diff the two versions (d)do the default RPM action (q)install the package's version (i)merge interactively with vim (v)background this process and examine manually (z)exit command.
/etc/yum/pluginconf.d/merge-conf.conf
[main] enabled=1 # Set to true, to always get the output (removes the cmd line arg) always=false
enabled = 0|1always = true|false