diffconflicts

diffconflicts

whiteinge

A better Vimdiff Git mergetool

423 Stars
22 Forks
11 Watchers
Vim Script Language
bsd-3-clause License
100 SrcLog Score
Cost to Build
$52.2K
Market Value
$101.4K

Growth over time

15 data points  ·  2021-08-01 → 2026-11-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.

🏆 Show off this rank

whiteinge/diffconflicts on SrcLog (holo style)

Add it to a GitHub README or profile — the card updates as the ranking changes:

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