I also love sublime merge, any time im screensharing with someone pairing on some code and we finish up i pop it open straight from sublime to review our changes and they always want to know what tool it is. They just produce really great software.