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