Sublimerge for Sublime Text Link
Sublimerge is a $10 package for Sublime Text that performs difference previewing and merging. I’ve used it a few times and it is fast and functional but somewhat hard to master. It has some nice features for working with versions, SVN and Git too. It even does directory comparisons.