vimdiff
There are 13 repositories under vimdiff topic.
whiteinge/diffconflicts
A better Vimdiff Git mergetool
samoshkin/vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool
rickhowe/diffchar.vim
Highlight the exact differences, based on characters and words
justbur/emacs-vdiff
Like vimdiff for Emacs
rickhowe/spotdiff.vim
A range and area selectable diffthis to compare partially
wimstefan/Lightning
A light vim colorscheme based on Apprentice
rafikdraoui/jj-diffconflicts
A conflict resolution merge tool for Jujutsu VCS that runs in Neovim
rickhowe/difffilter
Selectively compare lines as you want in diff mode
agriffis/vimmerge
vim wrapper for merges
rickhowe/wrapfiller
Align each wrapped line virtually between windows
abraham-ukachi/git-begins
A repository created as part of a school assignment on Git & Github that contains ~4 jobs.
neninja/exemplo_vim-merge-conflict
Demonstração da resolução de conflitos git com Vim/Neovim
FedericoCeratto/git-split
Split old commit in git using vimdiff or meld