search

rhysd / conflict-marker.vim

Weapon to fight against conflicts in Vim.
488 stars 18 forks source link

Support conflictStyle = diff3 #5

Closed unphased closed 6 years ago

unphased commented 6 years ago

I like this style of conflict markers because it provides me enough data to both as a human and programmatically see exactly what THEIR change is and OUR change is.

Git conflicts provide chunks that are way easier to grok as diffs themselves. Using this config allows this to be possible.

So at any rate, in the presence of this git config, this plugin fails to account for the ||||||| section.

sersorrel commented 6 years ago

seems to be the same as #2

unphased commented 6 years ago

Thank you, @anowlcalledjosh ! I will specify your branch in my vim-plug and report back once I test it.