Sublime Merge is fantastic. I've moved on from sublime text, but sublime Merge is a tool I use everday. Invaluable.