m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 21:33:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compensate for 'noequalalways' in merge diff

Browse Source 
Closes https://github.com/tpope/vim-fugitive/issues/674
This commit is contained in:
Tim Pope
2019-08-16 03:13:32 -04:00
parent b6dbe402e8
commit d6f7eaf16c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/fugitive.vim
View File

@@ -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>') call s:Map('n', 'd' . (i + 2) . 'o', ':diffget '.nrx.'<Bar>diffupdate<CR>', '<silent>')
endfor endfor
call s:diffthis() call s:diffthis()
if len(parents) > 1
wincmd =
endif
return post return post
elseif len(args) elseif len(args)
let arg = join(args, ' ') let arg = join(args, ' ')