Evil+ediff integration was merged into evil-collection.
Ediff config was moved out of core. Also includes evil compatibility (mvoed out of feature/evil) & wconf save/restore.