pomeh/Sublimerge
Sublimerge is a cross-platform Sublime Text 2/3 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.
Python
Sublimerge is a cross-platform Sublime Text 2/3 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.
Python