diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/plugins.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lua/plugins.lua b/lua/plugins.lua index 27b22ed..f9f57c2 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -233,6 +233,8 @@ require("packer").startup({ -- Better git log display use({ "rbong/vim-flog", requires = "tpope/vim-fugitive", cmd = { "Flog" } }) + use({ "christoomey/vim-conflicted", requires = "tpope/vim-fugitive", cmd = {"Conflicted"}}) + use({ "kevinhwang91/nvim-bqf", event = "FileType qf", config = [[require('config.bqf')]] }) -- Better git commit experience |