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

Remove broken deprecated :Git merge calling mergetool

Browse Source 
Closes https://github.com/tpope/vim-fugitive/issues/1704
This commit is contained in:
Tim Pope
2021-03-18 15:35:13 -04:00
parent d7c2e50816
commit 563faf95b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/fugitive.vim
View File

@@ -3970,7 +3970,7 @@ function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort
\ filereadable(fugitive#Find('.git/MERGE_MSG', dir)) || \ filereadable(fugitive#Find('.git/MERGE_MSG', dir)) ||
\ isdirectory(fugitive#Find('.git/rebase-apply', dir)) || \ isdirectory(fugitive#Find('.git/rebase-apply', dir)) ||
\ !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U'))) \ !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U')))
return 'echohl WarningMsg|echo ":Git merge for loading conflicts is deprecated in favor of :Git mergetool"|echohl NONE|silent Git' . (a:bang ? '!' : '') . s:fnameescape(a:options.flags + ['mergetool']) return 'echoerr ":Git merge for loading conflicts hase been removed in favor of :Git mergetool"'
endif endif
return {} return {}
endfunction endfunction