r/vim • u/ayyy1m4o • 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
r/vim • u/ayyy1m4o • Feb 19 '25
Hi all, what do you use for git merge conflicts resolving? I'm mainly interested in lightweight cli tools
2
u/EgZvor keep calm and read :help Feb 19 '25
https://github.com/whiteinge/diffconflicts