[skydhash]

While Sublime Merge is a nice piece of software, Magit is the very best example of a power user tool. Fast, versatile, and intuitive.