Flickering in 3 way diff

[TelpeNight]

Screen.Recording.2026-03-09.at.14.30.14.mp4

Codediff: 2.43.8
Nvim: 0.11.6
Term: ghostty
Os: Macos 15.7.4

I am getting constant flickering in 3 way diff. Also I can't move cursor away from rightmost window. If try to open other tab, I'm forced back to CodeDiff right away.

It seems that view is resetting by some error.

Codediff spec

return {
	"esmuellert/codediff.nvim",
	vertion = '^2.43.7',
	cmd = "CodeDiff",
	-- enabled = false,
}

Other plugins installed

{
  "auto-save.nvim": { "branch": "main", "commit": "61892d67acd5b7c845f5da4d780b26fcd7f63e34" },
  "catppuccin": { "branch": "main", "commit": "cb5665990a797b102715188e73c44c3931b3b42e" },
  "codediff.nvim": { "branch": "main", "commit": "d21a9a3ec5b46c92b38f4ad2e950b76b152151d5" },
  "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
  "mini.keymap": { "branch": "main", "commit": "9a1ee970f05b113b3ce9ee6f330fe862706b7e49" },
  "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" },
  "neogit": { "branch": "master", "commit": "8fd90675caf8b847280ca56f464b66030adad876" },
  "nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" },
  "nvim-treesitter": { "branch": "main", "commit": "d9079976495235b46b75a4da015885c6b7814efb" },
  "nvim-treesitter-context": { "branch": "master", "commit": "529ee357b8c03d76ff71233afed68fd0f5fe10b1" },
  "nvim-treesitter-textobjects": { "branch": "main", "commit": "4e91b5d0394329a229725b021a8ea217099826ef" },
  "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
  "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
  "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
  "tmux.nvim": { "branch": "main", "commit": "1eb600284ceb977710a26b7e4f7ce22c73c7afae" },
  "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }
}

[TelpeNight]

Also, maybe this is connected:

Screen.Recording.2026-03-09.at.18.29.56.mp4

git merge origin/main
nvim go.mod
:CodeDiff
ggjjjj<cr>

-- init.lua
vim.o.confirm = true

[sudo-tee]

I also have the same issue in conflicts resolution.

[esmuellert]

Fixed in PR #320. The root cause was the same-file deduplication check in on_file_select failing for conflict files — conflict revisions :2/:3 match the mutable pattern ^:[0-3]$, causing every git-watcher refresh to re-trigger the full conflict view setup. Added conflict-specific deduplication.