merge

2022-05-15 15:31:26 +08:00
parent 6b9a471465
commit ac1def0e0a
2 changed files with 11 additions and 5 deletions
@@ -60,4 +60,9 @@ return require('packer').startup(function()
    use "lukas-reineke/indent-blankline.nvim"

    use "norcalli/nvim-colorizer.lua"
+
+    -- ~/.gitconfig
+    -- [merge]
+    -- conflictStyle = diff3
+    use "samoshkin/vim-mergetool"
 end)