@@ -105,6 +105,10 @@ if vim.g.nvim_tree_git_hl == 1 then
105
105
{ hl = " NvimTreeFileStaged" },
106
106
{ hl = " NvimTreeFileNew" }
107
107
},
108
+ [" AU" ] = {
109
+ { hl = " NvimTreeFileMerge" },
110
+ { hl = " NvimTreeFileStaged" },
111
+ },
108
112
-- not sure about this one
109
113
[" AA" ] = {
110
114
{ hl = " NvimTreeFileMerge" },
@@ -126,6 +130,7 @@ if vim.g.nvim_tree_git_hl == 1 then
126
130
[" UU" ] = { { hl = " NvimTreeFileMerge" } },
127
131
[" UD" ] = { { hl = " NvimTreeFileMerge" } },
128
132
[" D" ] = { { hl = " NvimTreeFileDeleted" } },
133
+ [" DD" ] = { { hl = " NvimTreeFileDeleted" } },
129
134
[" D " ] = {
130
135
{ hl = " NvimTreeFileDeleted" },
131
136
{ hl = " NvimTreeFileStaged" }
@@ -182,6 +187,10 @@ if icon_state.show_git_icon then
182
187
{ icon = icon_state .icons .git_icons .unmerged , hl = " NvimTreeGitMerge" },
183
188
{ icon = icon_state .icons .git_icons .untracked , hl = " NvimTreeGitNew" },
184
189
},
190
+ [" AU" ] = {
191
+ { icon = icon_state .icons .git_icons .unmerged , hl = " NvimTreeGitMerge" },
192
+ { icon = icon_state .icons .git_icons .untracked , hl = " NvimTreeGitNew" },
193
+ },
185
194
[" AM" ] = {
186
195
{ icon = icon_state .icons .git_icons .staged , hl = " NvimTreeGitStaged" },
187
196
{ icon = icon_state .icons .git_icons .unstaged , hl = " NvimTreeGitDirty" }
@@ -196,6 +205,7 @@ if icon_state.show_git_icon then
196
205
[" UD" ] = { { icon = icon_state .icons .git_icons .unmerged , hl = " NvimTreeGitMerge" } },
197
206
[" D" ] = { { icon = icon_state .icons .git_icons .deleted , hl = " NvimTreeGitDeleted" } },
198
207
[" D " ] = { { icon = icon_state .icons .git_icons .deleted , hl = " NvimTreeGitDeleted" } },
208
+ [" DD" ] = { { icon = icon_state .icons .git_icons .deleted , hl = " NvimTreeGitDeleted" } },
199
209
[" DU" ] = {
200
210
{ icon = icon_state .icons .git_icons .deleted , hl = " NvimTreeGitDeleted" },
201
211
{ icon = icon_state .icons .git_icons .unmerged , hl = " NvimTreeGitMerge" },
0 commit comments