Date: 2018may2 OS: RedHat/Fedora/CentOS Q. rpm: Resolve .conf and .conf.rpmnew files? Also .rpmnew, .rpmsave and .rpmorig files! A. Install package rpmconf

dnf install rpmconf

And run:

rpmconf -a -f vimdiff

See the man page for rpmconf for more info