mergetools: simplify how we handle "vim" and "defaults"