Merge tool

Rodrigo Kochenburger 7 years ago updated by beer.mz 6 years ago 1

I'd love to be able to use sublime to merge differences and git conflicts. Similar to what you can do with vimdiff or opendiff.

Take a look at Sublimerge - the plugin that does right what you're looking for.