summaryrefslogtreecommitdiff
path: root/lua/user/nvim-tree.lua
diff options
context:
space:
mode:
authorVito G. Graffagnino <vito@graffagnino.xyz>2022-05-28 12:20:16 +0100
committerVito G. Graffagnino <vito@graffagnino.xyz>2022-05-28 12:20:16 +0100
commit7ccd48274bdd76b76fcffe9073de62289bcfcc22 (patch)
treea79f9ba2191902c5832c85dde55c0d13a198f713 /lua/user/nvim-tree.lua
parent03427b87604b573f2fd4c2683de378e4806f86fc (diff)
parente76f0ee92723ec238521383e4b4d3af0281a462b (diff)
Merge branch 'vgg' into 18-impatient18-impatient
Diffstat (limited to 'lua/user/nvim-tree.lua')
-rw-r--r--lua/user/nvim-tree.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua
index 9c5170c..c64c5e1 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/nvim-tree.lua
@@ -94,10 +94,13 @@ nvim_tree.setup {
number = false,
relativenumber = false,
},
+<<<<<<< HEAD
trash = {
cmd = "trash",
require_confirm = true,
},
+=======
+>>>>>>> vgg
quit_on_open = 0,
git_hl = 1,
disable_window_picker = 0,