I also love how fast Sublime Merge is. The built in merge tool is great too. I’m a sucker for apps with a command palette for easy access to every command.