fixed #1784 conflict

Author: chomosuke

lua/nvim-tree/explorer/filters.lua

@@ -24,15 +24,17 @@ local function git(path, git_status)
   end
 
   -- default status to clean
-  local status = git_status.files[path] or git_status.dirs[path] or "  "
+  local status = git_status.files[path]
+  status = status or git_status.dirs.direct[path] and git_status.dirs.direct[path][1]
+  status = status or git_status.dirs.indirect[path] and git_status.dirs.indirect[path][1]
 
   -- filter ignored; overrides clean as they are effectively dirty
   if M.config.filter_git_ignored and status == "!!" then
     return true
   end
 
   -- filter clean
-  if M.config.filter_git_clean and status == "  " then
+  if M.config.filter_git_clean and not status then
     return true
   end