search

christoomey / vim-conflicted

Easy git merge conflict resolution in Vim
MIT License
271 stars 12 forks source link

Use Gdiffsplit! with fugitive 3.0 #19

Closed geoffharcourt closed 5 years ago

geoffharcourt commented 5 years ago

Fugitive made a change in how diff splits are rendered in v3.0, where the default is now a two-pane view. To retain the three-pane view for our plugin, we need to use the new :Gdiffsplit! command instead.

This change leaves a shim where if the 3.0 command isn't defined, we'll retain the old behavior.

After creating this, I realized it's an alternate implementation of #17.

christoomey commented 5 years ago

Thanks for the very quick fix, Mr. Harcourt. Truly is always a pleasure when our paths cross!