merge

README.md

@@ -2,8 +2,9 @@
 
 my vim cfg
 
-merge test
+asdmertge 
-1
+2
-12
+abc
-3
+sdd
-4
+asdmertge
+sfads

lua/plugins.lua

@@ -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)