mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-13 05:43:52 -05:00
Compensate for 'noequalalways' in merge diff
Closes https://github.com/tpope/vim-fugitive/issues/674
This commit is contained in:
@@ -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>')
|
||||
endfor
|
||||
call s:diffthis()
|
||||
if len(parents) > 1
|
||||
wincmd =
|
||||
endif
|
||||
return post
|
||||
elseif len(args)
|
||||
let arg = join(args, ' ')
|
||||
|
||||
Reference in New Issue
Block a user