diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/p10k-classic.zsh | 2 | ||||
| -rw-r--r-- | config/p10k-lean.zsh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh index 4946a28a..b0fc9a86 100644 --- a/config/p10k-classic.zsh +++ b/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 diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh index 8b994bbd..ef9ab648 100644 --- a/config/p10k-lean.zsh +++ b/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 |