diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 61b2093..548167a 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -5092,7 +5092,7 @@ function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort \ filereadable(fugitive#Find('.git/MERGE_MSG', a:options)) || \ isdirectory(fugitive#Find('.git/rebase-apply', a:options)) || \ !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 return {} endfunction