From 8c63314381ba1235f05a845c0ced853371e2d26c Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Mon, 6 Aug 2018 11:13:30 -0400
Subject: [PATCH] Report error checking for merge conflict

References https://github.com/tpope/vim-fugitive/issues/756
---
 autoload/fugitive.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index f8d593c..7d9e86c 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -2567,6 +2567,9 @@ function! s:Diff(vert,keepfocus,...) abort
   if exists(':DiffGitCached')
     return 'DiffGitCached'
   elseif (empty(args) || args[0] ==# ':') && commit =~# '^[0-1]\=$' && !empty(s:TreeChomp('ls-files', '--unmerged', '--', s:Relative('')))
+    if v:shell_error
+      return 'echoerr ' . string("fugitive: error determining merge status of " . s:Relative(''))
+    endif
     let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert
     let nr = bufnr('')
     execute 'leftabove '.vert.'split' s:fnameescape(s:Generate(s:Relative(':2:')))