DEV Community

Discussion on: Solving git merge conflicts with VIM

Collapse
 
jessekphillips profile image
Jesse Phillips

I'd used fugitive for awhile but found the diff too cluttered. I switched to diffconflicts. It is not the only information needed to handle a merge, but it is often context on many files needed.

github.com/whiteinge/diffconflicts