A diff and merge plugin for sublime text