Sublimerge

官網
Sublimerge 3: The professional and amazing diff and merge tool for Sublime Text 3