vimdiff
Yesterday I was looking at merging review edits in a LaTeX document. I decided that I would use vimdiff, which meant learning the keybindings (again, for maybe the fifth or sixth time). It’s pretty easy to use vimdiff once you get the hang of it. Open two files like: vimdiff file1.tex file2.tex You navigate between the two windows just like any other split in vim: Ctrl-w followed by h or l (to move left or right).