[nuclear_eclipse]

I personally like to use vimdiff when viewing changes. A quick google shows some easy to follow instructions for setting it up:

http://blog.tplus1.com/index.php/2007/08/29/how-to-use-vimdi...

[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...