Resolving conflict when merging in 1570

lib/git.zsh

@@ -14,20 +14,20 @@ parse_git_dirty() {
   if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
-    fi  
+    fi
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
     else
         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
     fi
-    if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then
+    if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno  2> /dev/null) ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
-    fi  
+    fi
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
-  fi  
+  fi
 }
 
 # get the difference between the local and remote branches