diff options
author | HampusM <hampus@hampusmat.com> | 2024-06-09 13:52:08 +0200 |
---|---|---|
committer | HampusM <hampus@hampusmat.com> | 2024-06-09 13:52:08 +0200 |
commit | 5692bf2d44358c843a132d259f0c864b07cb30b3 (patch) | |
tree | 7e39eda03315fac117cc7dd60745f1382388fd95 /lua/plugins.lua | |
parent | e775b13c6ad8939033740d8ba5e95898905f9ad2 (diff) |
use telescope-git-conflicts plugin
Diffstat (limited to 'lua/plugins.lua')
-rw-r--r-- | lua/plugins.lua | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lua/plugins.lua b/lua/plugins.lua index 8a36e7c..f399c25 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -113,6 +113,17 @@ return require("packer").startup(function(use) } } } + + use { + "Snikimonkd/telescope-git-conflicts.nvim", + commit = "1ac7040f601d16ab3800bdda6f5912a0e385cb29", + requires = { + { + "nvim-lua/plenary.nvim", + commit = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" + } + } + } -- Telescope end -- Markdown |