Apparently, I need to spend more time reading through man pages so that I know about cool features in programs that I’ve used for years. If you run vim as “vimdiff” or “vim -d” it will display the differences between the files and it will dynamically update the display of the differences as you edit the files.
There is even a plugin for bazaar which adds the command “bzr vimdiff”, which makes it really easy to copy-and-paste parts of old versions of the file.

Atom Feed