GitHub topics: vimdiff
rickhowe/diffchar.vim
Highlight the exact differences, based on characters and words
Language: Vim Script - Size: 4.88 MB - Last synced at: 6 days ago - Pushed at: 6 days ago - Stars: 230 - Forks: 11

rafikdraoui/jj-diffconflicts
A conflict resolution merge tool for Jujutsu VCS that runs in Neovim
Language: Lua - Size: 142 KB - Last synced at: about 2 months ago - Pushed at: about 2 months ago - Stars: 24 - Forks: 0

samoshkin/vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool
Language: Vim script - Size: 7.05 MB - Last synced at: about 1 month ago - Pushed at: almost 5 years ago - Stars: 299 - Forks: 12

whiteinge/diffconflicts
A better Vimdiff Git mergetool
Language: Vim Script - Size: 729 KB - Last synced at: about 1 month ago - Pushed at: over 1 year ago - Stars: 409 - Forks: 19

justbur/emacs-vdiff
Like vimdiff for Emacs
Language: Emacs Lisp - Size: 886 KB - Last synced at: 3 months ago - Pushed at: about 2 years ago - Stars: 219 - Forks: 18

agriffis/vimmerge
vim wrapper for merges
Language: Shell - Size: 393 KB - Last synced at: 3 months ago - Pushed at: over 7 years ago - Stars: 4 - Forks: 0

rickhowe/spotdiff.vim
A range and area selectable diffthis to compare partially
Language: Vim Script - Size: 4.62 MB - Last synced at: 7 months ago - Pushed at: about 1 year ago - Stars: 45 - Forks: 5

rickhowe/difffilter
Selectively compare lines as you want in diff mode
Language: Vim Script - Size: 43 KB - Last synced at: about 1 year ago - Pushed at: about 1 year ago - Stars: 6 - Forks: 0

neninja/exemplo_vim-merge-conflict
Demonstração da resolução de conflitos git com Vim/Neovim
Size: 34.2 KB - Last synced at: about 1 year ago - Pushed at: about 1 year ago - Stars: 0 - Forks: 0

rickhowe/wrapfiller
Align each line exactly between windows even if wrapped
Language: Vim Script - Size: 59.6 KB - Last synced at: over 1 year ago - Pushed at: over 1 year ago - Stars: 3 - Forks: 0

wimstefan/Lightning
A light vim colorscheme based on Apprentice
Language: Vim script - Size: 1.32 MB - Last synced at: almost 2 years ago - Pushed at: about 7 years ago - Stars: 30 - Forks: 4

abraham-ukachi/git-begins
A repository created as part of a school assignment on Git & Github that contains ~4 jobs.
Size: 27.3 KB - Last synced at: 4 months ago - Pushed at: over 2 years ago - Stars: 1 - Forks: 0

FedericoCeratto/git-split
Split old commit in git using vimdiff or meld
Language: Shell - Size: 15.6 KB - Last synced at: 13 days ago - Pushed at: over 6 years ago - Stars: 0 - Forks: 0
