From 57a1cf10431e7c98663ddd11b7f27eaf80f222ba Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@anevia.com>
Date: Thu, 18 Jun 2015 17:21:15 +0200
Subject: Colors..

---
 11_Colors.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '11_Colors.zsh')

diff --git a/11_Colors.zsh b/11_Colors.zsh
index b61ebae..d5ae7ce 100644
--- a/11_Colors.zsh
+++ b/11_Colors.zsh
@@ -81,7 +81,7 @@ __set_prompt_colors ()
 	_gcl_colors[init]="$color[black];$color[bold]"
 	_gcl_colors[gitdir]="$color[red];$color[bold]"
 	_gcl_colors[uptodate]="38;5;39"
-	_gcl_colors[merging]="$color[bg-black]"
+	_gcl_colors[merging]="48;5;202"
 	_gcl_colors[changed]="$color[green]"
 	_gcl_colors[cached]="$color[yellow];$color[bold]"
 	_gcl_colors[mixed]="$color[green];$color[bold]"
-- 
cgit v1.2.3