|
|
@ -284,7 +284,7 @@ fi
|
|
|
|
# ~42 if have merge conflicts.
|
|
|
|
# ~42 if have merge conflicts.
|
|
|
|
vcs+='${${VCS_STATUS_NUM_CONFLICTED:#0}:+ %196F~${VCS_STATUS_NUM_CONFLICTED}}'
|
|
|
|
vcs+='${${VCS_STATUS_NUM_CONFLICTED:#0}:+ %196F~${VCS_STATUS_NUM_CONFLICTED}}'
|
|
|
|
# +42 if have staged changes.
|
|
|
|
# +42 if have staged changes.
|
|
|
|
vcs+='${${VCS_STATUS_NUM_STAGED:#0}:+ %227+${VCS_STATUS_NUM_STAGED}}'
|
|
|
|
vcs+='${${VCS_STATUS_NUM_STAGED:#0}:+ %227F+${VCS_STATUS_NUM_STAGED}}'
|
|
|
|
# !42 if have unstaged changes.
|
|
|
|
# !42 if have unstaged changes.
|
|
|
|
vcs+='${${VCS_STATUS_NUM_UNSTAGED:#0}:+ %227F!${VCS_STATUS_NUM_UNSTAGED}}'
|
|
|
|
vcs+='${${VCS_STATUS_NUM_UNSTAGED:#0}:+ %227F!${VCS_STATUS_NUM_UNSTAGED}}'
|
|
|
|
# ?42 if have untracked files.
|
|
|
|
# ?42 if have untracked files.
|
|
|
|