Add 'unmerged / added by them' as a recognized git state (#588)

This commit is contained in:
Ben
2021-08-28 02:54:44 -04:00
committed by GitHub
parent c75e4a63b7
commit 34e70ec69e

View File

@@ -129,6 +129,7 @@ if vim.g.nvim_tree_git_hl == 1 then
["R "] = { { hl = "NvimTreeFileRenamed" } },
["UU"] = { { hl = "NvimTreeFileMerge" } },
["UD"] = { { hl = "NvimTreeFileMerge" } },
["UA"] = { { hl = "NvimTreeFileMerge" } },
[" D"] = { { hl = "NvimTreeFileDeleted" } },
["DD"] = { { hl = "NvimTreeFileDeleted" } },
["RD"] = { { hl = "NvimTreeFileDeleted" } },
@@ -204,6 +205,7 @@ if icon_state.show_git_icon then
},
["UU"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
["UD"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
["UA"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
[" D"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } },
["D "] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } },
["RD"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } },