Hacker News
new
top
best
ask
show
job
Vim mergetool – Reimagined Git merge workflow
(
github.com
)
3 points
by
lemonwaterlime
9 hours ago
1 comment
lemonwaterlime
4 hours ago
This is very intuitive once you've used it a couple of times. I have handled conflicts that others were hesitant to touch with this.