akinsho / git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
1k stars 35 forks source link

bug: File paths in quickfix list are incorrect #64

Closed MariaSolOs closed 1 year ago

MariaSolOs commented 1 year ago

While working on #63, I noticed that the generated file paths have extra components.

For example, when my PWD is /Code/trouble.nvim and there's a conflict in /Code/trouble.nvim/lua/trouble/init.lua, the corresponding result when running GitConflictListQf will be located in /Code/trouble.nvim/lua/trouble/lua/trouble/init.lua.

The dropbar below makes the issue clearer:

image