christoomey / vim-conflicted

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

Error detected while processing function ConflictedTabLabel #14

Open albasili opened 6 years ago

albasili commented 6 years ago

This is what I get when calling :Conflicted in a repo that has a conflict.

christoomey commented 6 years ago

Hi @albasili, can you provide any additional info? Specifcally:

albasili commented 6 years ago

Actually I think the error comes from somewhere else. By calling :Conflicted while being sure no conflicts exists I have this:

Error detected while processing function <SNR>91_Conflicted[4]..<SNR>91_Merger[1]..<SNR>90_Diff:                                                                                                                                                                                
line   63:                                                                                                                                                                                                                                                                      
Traceback (most recent call last):                                                                                                                                                                                                                                              
  File "<string>", line 1, in <module>                                                                                                                                                                                                                                          
  File "/usr/lib/python3/dist-packages/powerline/vim.py", line 299, in statusline                                                                                                                                                                                               
    window, window_id, winnr = self.win_idx(window_id) or (None, None, None)                                                                                                                                                                                                    
  File "/usr/lib/python3/dist-packages/powerline/vim.py", line 276, in new_win_idx                                                                                                                                                                                              
    window.options['statusline'] = statusline                                                                                                                                                                                                                                   
vim.error: Vim:Traceback (most recent call last):                                                                                                                                                                                                                               
E858: Eval did not return a valid python object       

Is it something therefore related to powerline and python interaction?