Vim-mergetool: Nicer Git merge workflows with vim (plugin)github.com/samoshkin2 pointswithrocks6 years ago