Another +1 for Sublime Merge. I use it every day and it's incredibly well-designed and built.