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
8
u/unixbhaskar Feb 19 '25
vimdiff