[symbiotic]

This looks promising. Unfortunately I can't use any GUI tools because the server doesn't have a GUI installed.

[nuclear_eclipse]

Um, vimdiff is a command line tool... I run it in my terminals all the time...