From 6a2ded6ca84da59bdfba6bb14258c0e041424b2b Mon Sep 17 00:00:00 2001
From: jdhao <jdhao@hotmail.com>
Date: Sun, 9 Jan 2022 22:02:18 +0800
Subject: [PATCH] add plugin vim-conflicted for merge conflict handling

---
 lua/plugins.lua | 2 ++
 1 file changed, 2 insertions(+)

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