diff options
| author | jdhao <jdhao@hotmail.com> | 2022-01-09 22:02:18 +0800 |
|---|---|---|
| committer | jdhao <jdhao@hotmail.com> | 2022-01-09 22:02:18 +0800 |
| commit | 6a2ded6ca84da59bdfba6bb14258c0e041424b2b (patch) | |
| tree | 931160bc928f3e6f0ff94c62fe21c9e70711bfd3 /lua/plugins.lua | |
| parent | 41db6639d6599d009b91cf5455f235d0dc632f34 (diff) | |
add plugin vim-conflicted for merge conflict handling
Diffstat (limited to 'lua/plugins.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 |