using vimdiff

See here for how to switch back and forth between a horizontal split and a vertical split. Quick summary:

• To start vimdiff in horizontal-split mode, add -o to the command line.
• To change a vertical split into a horizontal one — ctrl+w, then shift-j