From 45c331230cf422e62066da12f8ae705c7901281d Mon Sep 17 00:00:00 2001
From: kiyan <yazdani.kiyan@protonmail.com>
Date: Tue, 1 Jun 2021 21:01:05 +0200
Subject: [PATCH] fix: handle UD status as git merge

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

diff --git a/lua/nvim-tree/renderer.lua b/lua/nvim-tree/renderer.lua
index 68ed6acf..e490294a 100644
--- a/lua/nvim-tree/renderer.lua
+++ b/lua/nvim-tree/renderer.lua
@@ -116,6 +116,7 @@ if vim.g.nvim_tree_git_hl == 1 then
     ["??"] = { { hl = "NvimTreeFileNew" } },
     ["R "] = { { hl = "NvimTreeFileRenamed" } },
     ["UU"] = { { hl = "NvimTreeFileMerge" } },
+    ["UD"] = { { hl = "NvimTreeFileMerge" } },
     [" D"] = { { hl = "NvimTreeFileDeleted" } },
     ["D "] = {
       { hl = "NvimTreeFileDeleted" },
@@ -178,6 +179,7 @@ if icon_state.show_git_icon then
       { icon = icon_state.icons.git_icons.renamed, hl = "NvimTreeGitRenamed" },
     },
     ["UU"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
+    ["UD"] = { { 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" } },
     ["DU"] = {