summaryrefslogtreecommitdiff
path: root/11_Colors.zsh
diff options
context:
space:
mode:
Diffstat (limited to '11_Colors.zsh')
-rw-r--r--11_Colors.zsh3
1 files changed, 2 insertions, 1 deletions
diff --git a/11_Colors.zsh b/11_Colors.zsh
index ada1fdb..dd26149 100644
--- a/11_Colors.zsh
+++ b/11_Colors.zsh
@@ -81,10 +81,11 @@ __set_prompt_colors ()
_gcl_colors[init]="$color[black];$color[bold]"
_gcl_colors[gitdir]="$color[red];$color[bold]"
_gcl_colors[uptodate]="$_prompt_colors[generic]"
+ _gcl_colors[merging]="$color[bg-black]"
_gcl_colors[changed]="$color[green]"
_gcl_colors[cached]="$color[yellow];$color[bold]"
_gcl_colors[mixed]="$color[green];$color[bold]"
- _gcl_colors[merging]="$color[bg-black]"
+ _gcl_colors[stashes]="$color[white]"
_gcl_colors[ffwd]="$color[red];$color[bold]"
_gcl_colors[diverged]="$color[black];$color[bold]"