diff --git a/README.md b/README.md index 332ef9e..bb60bb0 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ my vim cfg -merge test -1 -12 -3 -4 \ No newline at end of file +asdmertge +2 +abc +sdd +asdmertge +sfads diff --git a/lua/plugins.lua b/lua/plugins.lua index 44cee01..905024e 100644 --- a/lua/plugins.lua +++ b/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)