christoomey / vim-conflicted

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

Warning when running vundle for the second time #2

Closed zamith closed 10 years ago

zamith commented 10 years ago

After the fresh install, every time I run vundle, I get:

Error detected while processing /Users/zamith/dotfiles/vim/bundle/vim-conflicted/plugin/conflicted.vim
christoomey commented 10 years ago

Hey @zamith, sorry for the delayed repsonse! I seem to have mixed up my github notification settings.

I just pushed up e0a497586eb4d13d5f108ff01c8118ee8c337349 which will prevent Vundle from resourcing conflicted when installing other plugins. Please let me know if this solves it for you, and thanks for reporting.

zamith commented 10 years ago

@christoomey No problem. It is fixed.