Loreon
Labs
Platform
Docs
Home
Ecosystems
Vim script
diffconflicts
A better Vimdiff Git mergetool
Vim script
Emerging
GitHub
Stars
—
Forks
—
Contributors
6
Last push
49mo ago
Recent commits
Latest commits.
Merge branch 'whiteinge:master' into master
b2be93b
haraldkl
49mo ago
Merge pull request #25 from barlik/master
05e8d2e
Nathaniel Whiteinge
51mo ago
Allow zdiff3 conflict style
ef0179e
Rastislav Barlik
51mo ago
Merge pull request #1 from whiteinge/master
6f120be
haraldkl
66mo ago
Add a README for make-conflicts.sh to explain non-obvious points
69e9495
Seth House
67mo ago
Merge pull request #23 from whiteinge/readme-tweaks
205e0e0
Seth House
79mo ago
Small README tweaks to emphasize a few points
bde9887
Seth House
79mo ago
Merge commit 'refs/pull/22/head' of github.com:whiteinge/diffconflicts
61765d0
Seth House
85mo ago
Top contributors
Builders behind this project.
whiteinge
36 commits
UtahDave
4 commits
alfunx
3 commits
sudo-nice
2 commits
haraldkl
2 commits
tmc
1 commits
