Sublimerge

Diff and merge files directly in Sublime Text 2 and 3. Supports Git, SVN and Mercurial to compare files with their other revisions.