motiejus/dotfiles

commit 8c80cb63e2adf06d1eb07ad7cfb8a9c013d5a7a8 (tree)
parent dbdc9475337861ffca0638b882b94d58a186f7cd
Author: Tim Pope <code@tpope.net>
Date:   Sun, 14 Jul 2019 14:28:28 -0400

Fix E211 handling in :Gmerge/:Grebase

Diffstat:
M
autoload/fugitive.vim
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -3253,6 +3253,7 @@ function! s:MergeRebase(cmd, bang, mods, args, ...) abort
       silent! wall
     endif
     silent noautocmd make!
+  catch /^Vim\%((\a\+)\)\=:E211/
     let err = v:exception
   finally
     if exists('autowrite_was_set')