motiejus/dotfiles

commit 99fccd08e2c2e4dccae600e21f2a3c47f8b6e637 (tree)
parent 0858688120954e778c56e86e568550f87fa84a68
Author: Tim Pope <code@tpope.net>
Date:   Thu, 18 Mar 2021 22:17:34 -0400

Make :Gdiffsplit! from common ancestor stage open ours and theirs

References https://github.com/tpope/vim-fugitive/issues/1706

Diffstat:
M
autoload/fugitive.vim
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -4999,7 +4999,7 @@ function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, args) abort
   let back = exists('*win_getid') ? 'call win_gotoid(' . win_getid() . ')' : 'wincmd p'
   if (empty(args) || args[0] ==# ':') && a:keepfocus
     exe s:DirCheck()
-    if empty(commit) && s:IsConflicted()
+    if commit =~# '^1\=$' && s:IsConflicted()
       let parents = [s:Relative(':2:'), s:Relative(':3:')]
     elseif empty(commit)
       let parents = [s:Relative(':0:')]