4 ms·Vim mergetool – Reimagined Git merge workflow3 points by lemonwaterlime 2y agolemonwaterlime 2y agoThis is very intuitive once you've used it a couple of times. I have handled conflicts that others were hesitant to touch with this.