From: Robert R Evans <robert@codewranglers.org>
Date: Wed, 10 Nov 2010 23:49:21 +0000 (-0800)
Subject: merge conflict
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=6c975853292f6d897c871c51149a63ec62abd0b6;p=common%2Fbash_it.git

merge conflict
---

6c975853292f6d897c871c51149a63ec62abd0b6
diff --cc themes/bobby/bobby.theme.bash
index c8e3447,c8d6204..e719995
--- a/themes/bobby/bobby.theme.bash
+++ b/themes/bobby/bobby.theme.bash
@@@ -1,6 -1,10 +1,12 @@@
  #!/bin/bash
+ SCM_THEME_PROMPT_DIRTY=" ${red}✗"
+ SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+ SCM_THEME_PROMPT_PREFIX=" |"
+ SCM_THEME_PROMPT_SUFFIX="${green}|"
+ 
 -PROMPT="\[${bold_blue}\]\[\$(scm_char)\]\[${green}\]\[\$(scm_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt)\] \[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[→ "
++
++PROMPT="\[${bold_blue}\]\[\$(scm_char)\]\[${green}\]\[\$(scm_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt)\] \[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[\n\[${green}\]→\[${reset_color}\] "
 +
- PROMPT="\[${bold_blue}\]\[\$(prompt_char)\]\[\$(git_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt) \]\[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[\n\[${bold_blue}\]→\[${reset_color}\] "
  
  # git theming
  GIT_THEME_PROMPT_DIRTY=" ${red}✗"