diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-09-18 14:20:33 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-09-18 14:20:33 +0300 |
| commit | 79e0190ba1f42207b1fc59885713c8b3cbaa0cc8 (patch) | |
| tree | 923426c3bbfb2385993681ea473329e3676206b6 /internal/p10k.zsh | |
| parent | e470bbfe11f1e3c311edf5be06d99419b8194f52 (diff) | |
s/CONFLICTING/CONFLICTED/ for consistency; see #221
Diffstat (limited to 'internal/p10k.zsh')
| -rwxr-xr-x | internal/p10k.zsh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/p10k.zsh b/internal/p10k.zsh index be634d40..159dacb3 100755 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -2160,7 +2160,7 @@ typeset -gA __p9k_vcs_states=( 'MODIFIED' '3' 'UNTRACKED' '2' 'LOADING' '8' - 'CONFLICTING' '3' + 'CONFLICTED' '3' ) function +vi-git-untracked() { @@ -2442,8 +2442,8 @@ function _p9k_vcs_render() { if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); then if [[ -z $state ]]; then - if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTING_STATE == 1 ]]; then - state=CONFLICTING + if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then + state=CONFLICTED elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then state=MODIFIED elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then @@ -2495,8 +2495,8 @@ function _p9k_vcs_render() { local content if (( ${_POWERLEVEL9K_VCS_GIT_HOOKS[(I)vcs-detect-changes]} )); then - if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTING_STATE == 1 ]]; then - : ${state:=CONFLICTING} + if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then + : ${state:=CONFLICTED} elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then : ${state:=MODIFIED} elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then @@ -3589,7 +3589,7 @@ _p9k_init_params() { _p9k_declare -i POWERLEVEL9K_VCS_SHORTEN_MIN_LENGTH _p9k_declare -s POWERLEVEL9K_VCS_SHORTEN_STRATEGY _p9k_declare -e POWERLEVEL9K_VCS_SHORTEN_DELIMITER '\u2026' - _p9k_declare -b POWERLEVEL9K_VCS_CONFLICTING_STATE 0 + _p9k_declare -b POWERLEVEL9K_VCS_CONFLICTED_STATE 0 _p9k_declare -b POWERLEVEL9K_HIDE_BRANCH_ICON 0 _p9k_declare -b POWERLEVEL9K_VCS_HIDE_TAGS 0 _p9k_declare -i POWERLEVEL9K_CHANGESET_HASH_LENGTH 8 |