I’ve been using meld so far – but that is cumbersome if you are working on a remote machine. vimdiff is miles better in such cases:
“vimdiff file1 file2” or “vimdiff file1 file2 file3”
Move between panes with ‘ctrl-w‘ and left or right arrow keys. And you can yank/paste etc. between panes as well. Huzzah!