Fix E211 handling in :Gmerge/:Grebase

2019-07-14 14:28:28 -04:00 · 2019-07-14 14:28:28 -04:00 · 8c80cb63e2
commit 8c80cb63e2
parent dbdc947533
1 changed files with 1 additions and 0 deletions
--- 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')