search

christoomey / vim-conflicted

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

Splits out of order after running :GitNextConflict #7

Closed christoomey closed 10 years ago

christoomey commented 10 years ago

Showing upstream, local, working, and working is not in the diff

Should be upstream, working, local with all three in 3-way diff