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...
http://blog.tplus1.com/index.php/2007/08/29/how-to-use-vimdi...