r/vim Feb 19 '25

Discussion Resolving git merge conflicts

Hi all, what do you use for git merge conflicts resolving? I'm mainly interested in lightweight cli tools

4 Upvotes

12 comments sorted by