vimdiff

Star

Here are 14 public repositories matching this topic...

neninja / exemplo_vim-merge-conflict

Star

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

vim merge-conflicts nvim vimdiff merge-conflict merge-tool

Updated Oct 25, 2024

FedericoCeratto / git-split

Star

Split old commit in git using vimdiff or meld

git git-flow meld git-workflow vimdiff git-split

Updated Mar 23, 2019
Shell

LizardLiang / liz-diff.nvim

Star

Browse git diffs in Neovim from a centered floating window — diff any branch, commit, tag, or PR/MR, then jump into side-by-side vimdiff. Zero dependencies.

git vim diff lua neovim nvim pull-request code-review git-diff neovim-plugin floating-window vimdiff diff-viewer neovim-lua merge-request

Updated Oct 2, 2026
Lua

abraham-ukachi / git-begins

Star

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

github git git-clone git-status vimdiff git-branch git-merge git-log git-push git-mergetool git-fetch git-pull git-checkout

Updated Oct 11, 2022

agriffis / vimmerge

Star

vim wrapper for merges

git vim diff merge vimdiff mergetool git-mergetool

Updated Mar 22, 2018
Shell

rickhowe / difffilter

Star

Selectively compare lines as you want in diff mode

diff vim-plugin neovim-plugin vimdiff

Updated Jun 9, 2024
Vim Script

rickhowe / wrapfiller

Star

Align each wrapped line virtually between windows

diff vim-plugin wrap neovim-plugin vimdiff

Updated Nov 25, 2025
Vim Script

wimstefan / Lightning

Star

A light vim colorscheme based on Apprentice

light colorscheme vim-colors vimdiff

Updated Apr 6, 2018
Vim Script

rickhowe / spotdiff.vim

Star

A range and area selectable diffthis to compare partially

diff vim-plugin neovim-plugin vimdiff

Updated Oct 23, 2025
Vim Script

rafikdraoui / jj-diffconflicts

Star

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

neovim vimdiff jujutsu

Updated May 19, 2026
Lua

justbur / emacs-vdiff

Star

Like vimdiff for Emacs

diff emacs emacs-packages vimdiff

Updated Jun 21, 2023
Emacs Lisp

rickhowe / diffchar.vim

Star

Highlight the exact differences, based on characters and words

diff vim-plugin neovim-plugin vimdiff

Updated Oct 3, 2025
Vim Script

samoshkin / vim-mergetool

Star

🍰 Efficient way of using Vim as a Git mergetool

git vim merge-conflicts diff vim-plugin vimdiff mergetool

Updated Sep 7, 2020
Vim Script

whiteinge / diffconflicts

Star

A better Vimdiff Git mergetool

git vim vim-plugin vimdiff mergetool

Updated Jan 30, 2024
Vim Script

Add this topic to your repo

To associate your repository with the vimdiff topic, visit your repo's landing page and select "manage topics."

Learn more