Updating Rails applications with vimdiff
This is probably one of those things everyone knows about, but I only just figured it out, so here it...
Tags: ruby, rails, vim