vim: Add -merge to xrdb