
+2
Merge tool
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
beer mz 11 years ago
Take a look at Sublimerge - the plugin that does right what you're looking for.
Customer support service by UserEcho