Top 4 Vim Script vimdiff Projects

diffconflicts

16 380 2.4 Vim Script

A better Vimdiff Git mergetool

Project mention: Ask HN: Share a shell script you like | news.ycombinator.com | 2023-08-13

diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...
The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].
[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...

vim-mergetool

6 281 0.0 Vim Script

:cake: Efficient way of using Vim as a Git mergetool
WorkOS

workos.com sponsored

The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.
diffchar.vim

4 206 4.1 Vim Script

Highlight the exact differences, based on characters and words

Project mention: Git Single letter substitutions | /r/git | 2023-12-09

If you need character or word based diffs, the diffchar plugin adds support for them to vimdiff.

spotdiff.vim

1 37 3.0 Vim Script

A range and area selectable diffthis to compare partially

NOTE: The open source projects on this list are ordered by number of github stars. The number of mentions indicates repo mentiontions in the last 12 Months or since we started tracking (Dec 2020).