motiejus/dotfiles

commit 02eb2e871c2aec8e33050068289c6ca34ec7769e (tree)
parent 404c3c24e106cf273406c0bd836e6bd4ed87e9f0
Author: Tim Pope <code@tpope.net>
Date:   Tue,  7 Sep 2021 14:16:27 -0400

Fix typo in error message

Diffstat:
M
autoload/fugitive.vim
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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