+2

Merge tool

Rodrigo Kochenburger 5 years ago • updated by beer.mz 4 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.

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