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

Fix typo in error message

Browse Source
This commit is contained in:
Tim Pope
2021-09-07 14:16:27 -04:00
parent 404c3c24e1
commit 02eb2e871c
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

@@ -5092,7 +5092,7 @@ function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort
\ filereadable(fugitive#Find('.git/MERGE_MSG', a:options)) || \ filereadable(fugitive#Find('.git/MERGE_MSG', a:options)) ||
\ isdirectory(fugitive#Find('.git/rebase-apply', a:options)) || \ 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 has been removed in favor of :Git mergetool"'
endif endif
return {} return {}
endfunction endfunction