diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:15:01 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:15:01 +0100 |
| commit | a77e1095d3a820c975f68bbcfbedea0185096378 (patch) | |
| tree | 7620fbe96bcdd3e05e135a401b2793204de2ffb3 /lua/user/nvim-tree.lua | |
| parent | f92254108d154b3710bbd8d85ad2585b6a979107 (diff) | |
| parent | 24a4adc76f254309993eca04a79722bd1aea32ac (diff) | |
Merge branch 'vgg' into 16-toggleterm16-toggleterm
Diffstat (limited to 'lua/user/nvim-tree.lua')
| -rw-r--r-- | lua/user/nvim-tree.lua | 3 |
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, |