DirDiff is a plugin for vim. It allows you to compare directories, and easily use vim to view and edit the differences.