Sublime Merge gets you all those benefits, PLUS it’s really fast!