From 0590b8740d9b2bf345b64a31d058624327317d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Rainone?= <aurelien.rainone@gmail.com>
Date: Sun, 14 Feb 2016 17:46:48 +0100
Subject: [PATCH] Take num_conflicts into account for 'clean' flag

---
 gitstatus.sh            | 2 +-
 gitstatus_pre-1.7.10.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitstatus.sh b/gitstatus.sh
index 0e37310..5e8f623 100755
--- a/gitstatus.sh
+++ b/gitstatus.sh
@@ -46,7 +46,7 @@ if [[ "$__GIT_PROMPT_IGNORE_STASH" != "1" ]]; then
 fi
 
 clean=0
-if (( num_changed == 0 && num_staged == 0 && num_untracked == 0 && num_stashed == 0 )) ; then
+if (( num_changed == 0 && num_staged == 0 && num_untracked == 0 && num_stashed == 0 && num_conflicts )) ; then
   clean=1
 fi
 
diff --git a/gitstatus_pre-1.7.10.sh b/gitstatus_pre-1.7.10.sh
index 29b5911..a2984d6 100755
--- a/gitstatus_pre-1.7.10.sh
+++ b/gitstatus_pre-1.7.10.sh
@@ -50,7 +50,7 @@ if [[ "$__GIT_PROMPT_IGNORE_STASH" != "1" ]]; then
 fi
 
 clean=0
-if (( num_changed == 0 && num_staged == 0 && num_U == 0 && num_untracked == 0 && num_stashed == 0 )) ; then
+if (( num_changed == 0 && num_staged == 0 && num_untracked == 0 && num_stashed == 0 && num_conflicts == 0 )) ; then
   clean=1
 fi