From 4a043ff5eb249a5e04881c7dc4113ad91b87145e Mon Sep 17 00:00:00 2001
From: kiyan <yazdani.kiyan@protonmail.com>
Date: Fri, 11 Jun 2021 16:19:08 +0200
Subject: [PATCH] hotfix git state AA

---
 lua/nvim-tree/renderer.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lua/nvim-tree/renderer.lua b/lua/nvim-tree/renderer.lua
index 75f03998..b8920f88 100644
--- a/lua/nvim-tree/renderer.lua
+++ b/lua/nvim-tree/renderer.lua
@@ -104,6 +104,11 @@ if vim.g.nvim_tree_git_hl == 1 then
       { hl = "NvimTreeFileStaged" },
       { hl = "NvimTreeFileNew" }
     },
+    -- not sure about this one
+    ["AA"] = {
+      { hl = "NvimTreeFileMerge" },
+      { hl = "NvimTreeFileStaged" }
+    },
     ["AD"] = {
       { hl = "NvimTreeFileStaged" },
     },
@@ -170,6 +175,11 @@ if icon_state.show_git_icon then
     [" A"] = {
       { icon = icon_state.icons.git_icons.untracked, hl = "NvimTreeGitNew" },
     },
+    -- not sure about this one
+    ["AA"] = {
+      { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" },
+      { icon = icon_state.icons.git_icons.untracked, hl = "NvimTreeGitNew" },
+    },
     ["AM"] = {
       { icon = icon_state.icons.git_icons.staged, hl = "NvimTreeGitStaged" },
       { icon = icon_state.icons.git_icons.unstaged, hl = "NvimTreeGitDirty" }