A better Vimdiff Git mergetool

🍰 Efficient way of using Vim as a Git mergetool

Highlight the exact differences, based on characters and words

Like vimdiff for Emacs

A range and area selectable diffthis to compare partially

A light vim colorscheme based on Apprentice

A conflict resolution merge tool for Jujutsu VCS that runs in Neovim

Selectively compare lines as you want in diff mode

Align each wrapped line virtually between windows

vim wrapper for merges

A repository created as part of a school assignment on Git & Github that contains ~4 jobs.

Demonstração da resolução de conflitos git com Vim/Neovim

Split old commit in git using vimdiff or meld