Lately I've been using sublime merge, works pretty well.