diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:24:08 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:24:08 +0100 |
| commit | 625cbc47271842540a0bee111b2a83ef65883de4 (patch) | |
| tree | 629d713891cc7d5e485b6b4bcf24f9bc99d7bc3a /lua/user/nvim-tree.lua | |
| parent | 95e5604074b7443968f01738f7c556260a13b297 (diff) | |
| parent | b49b14da051b693036bf8d71dc9932b31a8cafa0 (diff) | |
Merge branch 'vgg' into 20-alpha20-alpha
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, |