From 5a496dca643deb0405605f6b0599b5d7ffbda42b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 8 Jun 2023 20:14:46 -0400
Subject: [PATCH] vimPlugins.git-conflict-nvim: init at 2023-05-23

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index b145959e6c4f..f20b3cdda363 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -296,6 +296,7 @@ https://github.com/ndmitchell/ghcid/,,
 https://github.com/eagletmt/ghcmod-vim/,,
 https://github.com/lambdalisue/gina.vim/,,
 https://github.com/f-person/git-blame.nvim/,,
+https://github.com/akinsho/git-conflict.nvim/,HEAD,
 https://github.com/rhysd/git-messenger.vim/,,
 https://github.com/ThePrimeagen/git-worktree.nvim/,,
 https://github.com/vim-scripts/gitignore.vim/,,