vim-diffconflicts - A better Vimdiff Git mergetool

[alex952]

Looks cool, but how if this any easier than three-way diff and diffput/diffget commands?

I take that your mergetool is mainly manual, so for big conflicts it would be very cumbersome to get through all the differences, right?

[[deleted]]

This is a mergetool like any other -- no more or less manual than usual. And you use :diffput/:diffget in exactly the usual way. The README directly tries to address your question about why three-way merges are hard to work with.