m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 13:23:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Report error checking for merge conflict

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/756
This commit is contained in:
Tim Pope
2018-08-06 11:13:30 -04:00
parent 12e0151750
commit 8c63314381
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/fugitive.vim
View File

@@ -2567,6 +2567,9 @@ function! s:Diff(vert,keepfocus,...) abort
if exists(':DiffGitCached') if exists(':DiffGitCached')
return 'DiffGitCached' return 'DiffGitCached'
elseif (empty(args) || args[0] ==# ':') && commit =~# '^[0-1]\=$' && !empty(s:TreeChomp('ls-files', '--unmerged', '--', s:Relative(''))) elseif (empty(args) || args[0] ==# ':') && commit =~# '^[0-1]\=$' && !empty(s:TreeChomp('ls-files', '--unmerged', '--', s:Relative('')))
if v:shell_error
return 'echoerr ' . string("fugitive: error determining merge status of " . s:Relative(''))
endif
let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert
let nr = bufnr('') let nr = bufnr('')
execute 'leftabove '.vert.'split' s:fnameescape(s:Generate(s:Relative(':2:'))) execute 'leftabove '.vert.'split' s:fnameescape(s:Generate(s:Relative(':2:')))