A better Vimdiff Git mergetool
Why do you think that https://github.com/rhysd/conflict-marker.vim is a good alternative to diffconflicts
A better Vimdiff Git mergetool
Why do you think that https://github.com/rhysd/conflict-marker.vim is a good alternative to diffconflicts