3 ms·

Yes! I’m pretty happy with Sublime Merge. It’s also cross platform (like Sublime Text) which is very handy.