From e679734f4cb152400cd60f8285f8f325bc530786 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Thu, 1 Aug 2013 15:15:28 +0200 Subject: [Git] Better ahead/behind/diverged managment (part 2) --- 11_Colors.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '11_Colors.zsh') 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]" -- cgit v1.2.3