diffconflicts

diffconflicts copied to clipboard

Feedback :)

6

This plugin is golden :heart: It's kept simple and does the job very well :+1: Then I was reading git config options, I saw `mergetool.hideResolved` (added somewhere in 2021): >...

bew

Compatibility with folding

2

Thank you for this really useful plugin. However, I am getting confusing results when folding is enabled. I think that the `:g` commands don't look inside the folds, so they...

giuseppelettieri

Using diff-specific configuration in .vimrc

1

Thanks for this 😊 I'd like to set up some specific configuration options (eg changing the colour scheme, remapping `:diffget`) when resolving git conflicts with diffconflicts. For regular vimdiff, I...

danielcarr