diffget deletes a line instead of getting the change

[LearnBeFree]

Hi, I have installed vim-fugitive in nvim with lazy plugin manager, my config is available here

The plugin seems to be working fine, but doing a :diffget in a three-way split mode deletes a line instead of applying the change.

When I do the same in vim the plugin (installed with PlugInstall) works fine.

I have recorded the problem in a short video (file is attached):

Thank you very much for the plugin!

showcasing-vim-fugitive-error.mp4

[LearnBeFree]

I have come across a case, when diffget does not work in vim, too:

showcasing-vim-fugitive-error-in-vim-too.mp4

(Only one line gets deleted)

[AchmadFathoni]

Any update? I remember in older version diffget //2 replace entire conflicting hunk

[osullivandonal]

There is an open issue in Neovim about this, see here. A good workaround for this atm is to use this in your nvim config:

vim.opt.diffopt:remove("linematch:40")