Makussu/jdhao-nvim-config
1
0
Fork 0
mirror of https://github.com/jdhao/nvim-config.git synced 2025-06-08 14:14:33 +02:00
Code Issues Projects Releases Wiki Activity

add plugin vim-conflicted for merge conflict handling

Browse Source
This commit is contained in:
jdhao 2022-01-09 22:02:18 +08:00
parent 41db6639d6
commit 6a2ded6ca8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/plugins.lua
View File

@ -233,6 +233,8 @@ require("packer").startup({
-- Better git log display -- Better git log display
use({ "rbong/vim-flog", requires = "tpope/vim-fugitive", cmd = { "Flog" } }) 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')]] }) use({ "kevinhwang91/nvim-bqf", event = "FileType qf", config = [[require('config.bqf')]] })
-- Better git commit experience -- Better git commit experience