3 ms·Lately I've been using sublime merge, works pretty well.by amdolan 6y agoLately I've been using sublime merge, works pretty well.