from
Hacker News
Top
New
Vim mergetool – Reimagined Git merge workflow
by
lemonwaterlime
on 1/17/25, 5:18 PM with 1 comments
by
lemonwaterlime
on 1/17/25, 10:02 PM
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.