#mergetool · dorkhub

show your thing

vim-mergetool

:cake: Efficient way of using Vim as a Git mergetool

Vim script★ 308

diff git merge-conflicts mergetool vim vim-plugin vimdiff

diffconflicts

A better Vimdiff Git mergetool

Vim Script★ 424

git mergetool vim vim-plugin vimdiff