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

Have you seen Sublimerge plugin? It does what you need.