fix: prevent flickering in 3-way conflict diff (#317)#320

esmuellert merged 1 commit intomainesmuellert/codediff.nvim:mainfrom

devesmuellert/codediff.nvim:devCopy head branch name to clipboard