vimPlugins.conflict-nvim: init at 0-unstable-2026-04-25

https://github.com/niekdomi/conflict.nvim

pkgs/applications/editors/vim/plugins/generated.nix

@@ -3902,6 +3902,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  conflict-nvim = buildVimPlugin {
+    pname = "conflict.nvim";
+    version = "0-unstable-2026-04-25";
+    src = fetchFromGitHub {
+      owner = "niekdomi";
+      repo = "conflict.nvim";
+      rev = "fdc879c34c528aab90e1b90c5d408d141f31fef8";
+      hash = "sha256-hXww2PNTU5LX5egngKwMxOjvQl5CMgzBbDesRswPD2g=";
+    };
+    meta.homepage = "https://github.com/niekdomi/conflict.nvim/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
     version = "9.1.0-unstable-2026-05-15";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -277,6 +277,7 @@ https://github.com/nvim-lua/completion-nvim/,,
 https://github.com/aca/completion-tabnine/,,
 https://github.com/chikatoike/concealedyank.vim/,,
 https://github.com/rhysd/conflict-marker.vim/,,
+https://github.com/niekdomi/conflict.nvim/,,
 https://github.com/stevearc/conform.nvim/,,
 https://github.com/Olical/conjure/,,
 https://github.com/niklasdewally/conjure.nvim/,,