Vim plugin for highlighting and resolving diff3-style conflicts
Why do you think that https://github.com/whiteinge/diffconflicts is a good alternative to conflict3
Vim plugin for highlighting and resolving diff3-style conflicts
Why do you think that https://github.com/whiteinge/diffconflicts is a good alternative to conflict3