From c23e02722e6d5be0dcea68d78c1197944d95f352 Mon Sep 17 00:00:00 2001
From: Locojay <locojay@dev.dev>
Date: Sun, 5 Jun 2011 20:38:21 -0400
Subject: [PATCH] ashlydev

---
 plugins/git/git-prompt-old.plugin.zsh | 36 +--------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/plugins/git/git-prompt-old.plugin.zsh b/plugins/git/git-prompt-old.plugin.zsh
index 7be7d1c26..bb7f05381 100644
--- a/plugins/git/git-prompt-old.plugin.zsh
+++ b/plugins/git/git-prompt-old.plugin.zsh
@@ -46,14 +46,8 @@ function git_prompt_long_sha() {
   fi
 }
 
-<<<<<<< HEAD
-# Get the status of the working tree
-git_prompt_status() {
-<<<<<<< HEAD
-=======
 # Gets the status of the working tree.
 function git_prompt_status() {
->>>>>>> ashleydev/master
   local indicators line untracked added modified renamed deleted
   while IFS=$'\n' read line; do
     if [[ "$line" =~ '^\?\? ' ]]; then
@@ -82,33 +76,5 @@ function git_prompt_status() {
     fi
   done < <(git status --porcelain 2> /dev/null)
   echo $indicators
-=======
-  INDEX=$(git status --porcelain 2> /dev/null)
-  STATUS=""
-  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-  fi
-  echo $STATUS
->>>>>>> robbyrussel/master
 }
+