diffconflicts

whiteinge

A better Vimdiff Git mergetool

git vim

View on GitHub

409 Stars

19 Forks

409 Watchers

Vim Script Language

bsd-3-clause License

Cost to Build

$49.9K

Market Value

$154.1K

How is this calculated?

Growth over time

9 data points · 2021-08-01 → 2025-06-01

Stars Forks Watchers

💬

How do you feel about this project?

Ask AI about diffconflicts

Question copied to clipboard

What is the whiteinge/diffconflicts GitHub project? Description: "A better Vimdiff Git mergetool". Written in Vim Script. Explain what it does, its main use cases, key features, and who would benefit from using it.

Question is copied to clipboard — paste it after the AI opens.

How to clone diffconflicts

Clone via HTTPS

git clone https://github.com/whiteinge/diffconflicts.git

Clone via SSH

[email protected]:whiteinge/diffconflicts.git

Download ZIP

Download master.zip

Found an issue?

Report bugs or request features on the diffconflicts issue tracker:

Open GitHub Issues

Similar to diffconflicts

gitignore gogs tips hub git-extras diff-so-fancy phabricator gitea husky ungit git-recipes gitbucket libgit2 tig git-lfs decap-cms gitsome desktop pure git-standup githug legit docker-gitlab vim-gitgutter gitql my-git semantic-release gitpitch bfg-repo-cleaner git-style-guide