From 8c80cb63e2adf06d1eb07ad7cfb8a9c013d5a7a8 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sun, 14 Jul 2019 14:28:28 -0400
Subject: [PATCH] Fix E211 handling in :Gmerge/:Grebase

---
 autoload/fugitive.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 3d6e355..e2ecfc0 100644
--- 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')