Sublimerge is a cross-platform Sublime Text 2 plugin which allows to diff and merge files DIRECTLY in the editor using graphical interface for that purpose. Supports GIT and SVN to compare files with their other revisions.