update docs

2 years ago · f62fa11520
parent 1cad544476
commit f62fa11520
2 changed files with 6 additions and 0 deletions
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+
+## Git merging with upstream
+use the strategy=ours
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@ -1,4 +1,7 @@
 -- vim: foldlevel=0
+--
+-- TODO: interesting plugins to install
+-- - neovim minisurround to replace vim-surround

 return {
  ["nvim-treesitter/nvim-treesitter-textobjects"] = {