samoshkin/vim-mergetool

View on GitHub ↗ ★ 307 Vim Script

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

3 mentions on Hacker News by 2 people: 2 stories, 1 comment · first 2020-08-19 · latest 2026-03-22

Mentions per year 3 mentions · busiest year 2020 (1)

20082026

All Stories Comments Newest Top Oldest

…and it's quite intuitive. I've resolved conflicts that other people didn't even want to touch. [1]: https://github.com/samoshkin/vim-mergetool
comment by lemonwaterlime · 2026-03-22 · in The future of version control