From 7a75c18554604011b76c2c4a5da6248a9085cee0 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Wed, 26 May 2021 07:15:23 -0400
Subject: [PATCH] Fix :Git mergetool line offset

This was broken in 895e56daca03c441427f2adca291cb10ea4d7ca8 by
misreading a version constraint.

Resolves: https://github.com/tpope/vim-fugitive/issues/1755
---
 autoload/fugitive.vim | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 2f298f0..e8319b8 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -4457,10 +4457,7 @@ function! s:ToolStream(line1, line2, range, bang, mods, options, args, state) ab
   let a:state.mode = 'init'
   let a:state.from = ''
   let a:state.to = ''
-  let exec = s:UserCommandList({'git': a:options.git, 'dir': a:options.dir})
-  if !s:HasOpt(argv, '--name-status') && !prompt
-    let exec += ['-c', 'diff.context=0']
-  endif
+  let exec = s:UserCommandList({'git': a:options.git, 'dir': a:options.dir}) + ['-c', 'diff.context=0']
   let exec += a:options.flags + ['--no-pager', 'diff', '--no-ext-diff', '--no-color', '--no-prefix'] + argv
   if prompt
     let title = ':Git ' . s:fnameescape(a:options.flags + [a:options.subcommand] + a:options.subcommand_args)