+2

Merge tool

Rodrigo Kochenburger hace 11 años actualizado por beer mz hace 10 años 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.