From 5b1213d0db85ba99c2271caae0e175b253a15883 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Mon, 20 Jan 2020 05:51:28 -0500
Subject: [PATCH] Fix :Gmerge

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

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 90e689a..0d077d0 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -3761,7 +3761,7 @@ endfunction
 
 function! s:MergeSubcommand(line1, line2, range, bang, mods, args) abort
   let dir = s:Dir()
-  if empty(args) && (
+  if empty(a:args) && (
         \ filereadable(fugitive#Find('.git/MERGE_MSG', dir)) ||
         \ isdirectory(fugitive#Find('.git/rebase-apply', dir)) ||
         \  !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U')))