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

Fix :Git merge

Browse Source 
Resolves: https://github.com/tpope/vim-fugitive/issues/1817
This commit is contained in:
Tim Pope
2021-08-25 04:39:51 -04:00
parent e91d17ddc2
commit b07632a616
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/fugitive.vim
View File

@@ -4936,8 +4936,8 @@ endfunction
function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort
if empty(a:options.subcommand_args) && ( if empty(a:options.subcommand_args) && (
\ filereadable(fugitive#Find('.git/MERGE_MSG', dir)) || \ filereadable(fugitive#Find('.git/MERGE_MSG', a:options)) ||
\ isdirectory(fugitive#Find('.git/rebase-apply', dir)) || \ isdirectory(fugitive#Find('.git/rebase-apply', a:options)) ||
\ !empty(s:TreeChomp([a:options.git_dir, 'diff-files', '--diff-filter=U']))) \ !empty(s:TreeChomp([a:options.git_dir, 'diff-files', '--diff-filter=U'])))
return 'echoerr ":Git merge for loading conflicts hase been removed in favor of :Git mergetool"' return 'echoerr ":Git merge for loading conflicts hase been removed in favor of :Git mergetool"'
endif endif