From d6f7eaf16cde354cd3002e78152122616aaef1e0 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Fri, 16 Aug 2019 03:13:32 -0400
Subject: [PATCH] Compensate for 'noequalalways' in merge diff

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

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 5687f4e..e2182d1 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -4439,6 +4439,9 @@ function! s:Diff(autodir, keepfocus, mods, ...) abort
         call s:Map('n', 'd' . (i + 2) . 'o', ':diffget '.nrx.'<Bar>diffupdate<CR>', '<silent>')
       endfor
       call s:diffthis()
+      if len(parents) > 1
+        wincmd =
+      endif
       return post
     elseif len(args)
       let arg = join(args, ' ')