vim/vimdiff -- just trolling, but it's what I use :)

Everyone else I work with uses: http://www.kaleidoscopeapp.com