search

christoomey / vim-conflicted

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

Strange errors with `vim +Conflicted` #4

Closed calebhearth closed 10 years ago

calebhearth commented 10 years ago

It seems to have worked right, but this happened first:

"app/models/activity.rb" 46L, 843C                                                                    
Error detected while processing function <SNR>66_Conflicted..<SNR>66_Merger..<SNR>66_MapTargetedDiffge
ts:                                                                                                   
line    1:                                                                                            
E121: Undefined variable: g:diffget_local_map                                                         
E15: Invalid expression: 'xmap <buffer> ' . g:diffget_local_map . ' <Plug>DiffgetLocal'               
line    2:                                                                                            
E121: Undefined variable: g:diffget_local_map                                                         
E15: Invalid expression: 'nmap <buffer> ' . g:diffget_local_map . ' <Plug>DiffgetLocal'               
line    4:                                                                                            
E121: Undefined variable: g:diffget_upstream_map                                                      
E15: Invalid expression: 'xmap <buffer> ' . g:diffget_upstream_map . ' <Plug>DiffgetUpstream'         
line    5:                                                                                            
E121: Undefined variable: g:diffget_upstream_map                                                      
<b/code/schoolkeep/.git//3/app/models/activity.rb" [Not edited] 30 lines --3%-- ((1) of 5)
calebhearth commented 10 years ago

Also happens for :GitNextConflict

:GitNextConflict                                                                      
"app/views/school_website/activities/_download.html.erb" 5L, 228C                                     
Error detected while processing function <SNR>66_GitNextConflict..<SNR>66_NextOrQuit..<SNR>66_Merger..
<SNR>66_MapTargetedDiffgets:                                                                          
line    1:                                                                                            
E121: Undefined variable: g:diffget_local_map                                                         
E15: Invalid expression: 'xmap <buffer> ' . g:diffget_local_map . ' <Plug>DiffgetLocal'               
line    2:                                                                                            
E121: Undefined variable: g:diffget_local_map                                                         
E15: Invalid expression: 'nmap <buffer> ' . g:diffget_local_map . ' <Plug>DiffgetLocal'               
line    4:                                                                                            
E121: Undefined variable: g:diffget_upstream_map                                                      
E15: Invalid expression: 'xmap <buffer> ' . g:diffget_upstream_map . ' <Plug>DiffgetUpstream'         
line    5:                                                                                            
E121: Undefined variable: g:diffget_upstream_map                                                      
<ews/school_website/activities/_download.html.erb" [Not edited] 1 line --100%-- ((1) of 4)
christoomey commented 10 years ago

@calebthompson @joelq Can you see if e14613c4e814b4be8fa4dd4bf22876a06f184db6 fixes this for you?

calebhearth commented 10 years ago

How?

calebhearth commented 10 years ago

It did.

christoomey commented 10 years ago

Closed by #e14613c4e814b4be8fa4dd4bf22876a06f184db6