[Bug 226526] Merge Review: vim