search

christoomey / vim-conflicted

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

Conflicted opens with the 3 views in stacked vertically #6

Closed JESii closed 10 years ago

JESii commented 10 years ago

Open vim, issue command Conflicted,and I see my three views, but they're stacked horizontally (:sp mode) instead of side-by-side as described in the README. Maybe something I have in my .vimrc, but I can't figure it out.

christoomey commented 10 years ago

I believe this is due to a change recently introduced in fugitive. You should be able to fix by enforcing a vertical diff. Try adding this to your vimrc

set diffopt+=vertical
christoomey commented 10 years ago

Going to close this now assuming the above fixed it, but please reopen or comment if you still see the issue.