Better vim-based mergetool
Why do you think that https://github.com/whiteinge/diffconflicts is a good alternative to vim-mergetool
Better vim-based mergetool
Why do you think that https://github.com/whiteinge/diffconflicts is a good alternative to vim-mergetool