Guard against empty filename checking for conflicts
Closes https://github.com/tpope/vim-fugitive/issues/1287
This commit is contained in:
parent
0c259e3016
commit
4da9fb8f43
@ -3995,7 +3995,7 @@ function! s:CompareAge(mine, theirs) abort
|
||||
endfunction
|
||||
|
||||
function! s:IsConflicted() abort
|
||||
return !empty(s:TreeChomp('ls-files', '--unmerged', '--', expand('%:p')))
|
||||
return len(@%) && !empty(s:ChompDefault('', 'ls-files', '--unmerged', '--', expand('%:p')))
|
||||
endfunction
|
||||
|
||||
function! s:Diff(autodir, keepfocus, mods, ...) abort
|
||||
|
Loading…
Reference in New Issue
Block a user