add POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM

config/p10k-classic.zsh

@@ -322,7 +322,7 @@ fi
   typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION=${${vcs//\%f}//\%<->F}
   typeset -g POWERLEVEL9K_VCS_LOADING_FOREGROUND=244
   # Enable counters for staged, unstaged, etc.
-  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1
+  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1
 
   # Icon color.
   typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76

config/p10k-lean.zsh

@@ -306,7 +306,7 @@ fi
   typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION=${${vcs//\%f}//\%<->F}
   typeset -g POWERLEVEL9K_VCS_LOADING_FOREGROUND=244
   # Enable counters for staged, unstaged, etc.
-  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1
+  typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1
 
   # Icon color.
   typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76

internal/p10k.zsh

@@ -3638,6 +3638,7 @@ _p9k_init_params() {
   _p9k_declare -i POWERLEVEL9K_VCS_STAGED_MAX_NUM 1
   _p9k_declare -i POWERLEVEL9K_VCS_UNSTAGED_MAX_NUM 1
   _p9k_declare -i POWERLEVEL9K_VCS_UNTRACKED_MAX_NUM 1
+  _p9k_declare -i POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM 1
   _p9k_declare -i POWERLEVEL9K_VCS_COMMITS_AHEAD_MAX_NUM -1
   _p9k_declare -i POWERLEVEL9K_VCS_COMMITS_BEHIND_MAX_NUM -1
   _p9k_declare -b POWERLEVEL9K_DISABLE_GITSTATUS 0
@@ -4141,6 +4142,7 @@ _p9k_init() {
           -s $_POWERLEVEL9K_VCS_STAGED_MAX_NUM       \
           -u $_POWERLEVEL9K_VCS_UNSTAGED_MAX_NUM     \
           -d $_POWERLEVEL9K_VCS_UNTRACKED_MAX_NUM    \
+          -c $_POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM   \
           -m $_POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY \
           POWERLEVEL9K || _POWERLEVEL9K_DISABLE_GITSTATUS=1
       fi