m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-13 22:03:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/1706
This commit is contained in:
Tim Pope
2021-03-18 22:17:34 -04:00
parent 0858688120
commit 99fccd08e2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/fugitive.vim
View File

@@ -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' let back = exists('*win_getid') ? 'call win_gotoid(' . win_getid() . ')' : 'wincmd p'
if (empty(args) || args[0] ==# ':') && a:keepfocus if (empty(args) || args[0] ==# ':') && a:keepfocus
exe s:DirCheck() exe s:DirCheck()
if empty(commit) && s:IsConflicted() if commit =~# '^1\=$' && s:IsConflicted()
let parents = [s:Relative(':2:'), s:Relative(':3:')] let parents = [s:Relative(':2:'), s:Relative(':3:')]
elseif empty(commit) elseif empty(commit)
let parents = [s:Relative(':0:')] let parents = [s:Relative(':0:')]