From fccb1c4a7db64b1b9edb1ddf19eb8ac91ac7cb54 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@qosmos.com>
Date: Thu, 25 Oct 2012 10:23:03 +0200
Subject: [Git] Displays diverged among fast-forwardable heads.

---
 01_Internal.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '01_Internal.zsh')

diff --git a/01_Internal.zsh b/01_Internal.zsh
index 48f3dcf..c7297fe 100644
--- a/01_Internal.zsh
+++ b/01_Internal.zsh
@@ -314,7 +314,7 @@ __get_git_status ()
 		fi
 	fi
 
-    if [ $(git status | sed -n '2{/can be fast-forwarded/p};3q' | wc -l) -gt 0 ]
+    if [ $(git status | sed -n '2{/can be fast-forwarded/p;/have diverged/p};3q' | wc -l) -gt 0 ]
     then
         my_git_status+=";$_gcl_colors[ffwd]"
     fi
-- 
cgit v1.2.3