For the vim users the fugitive plugin by tpope provides a nice way to do this using vim's vimdiff. It is a delight to use.

Here is a video of vimcasts tutorial. http://vimcasts.org/episodes/fugitive-vim-working-with-the-g...