Merge remote-tracking branch 'upstream/master'

pull/41/head
Jesus de Mula Cano 2011-03-06 18:09:32 +01:00
commit 908e020a0b
1 changed files with 1 additions and 0 deletions

View File

@ -22,6 +22,7 @@ RVM_THEME_PROMPT_SUFFIX='|'
function scm { function scm {
if [[ -d .git ]]; then SCM=$GIT if [[ -d .git ]]; then SCM=$GIT
elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$GIT
elif [[ -d .hg ]]; then SCM=$HG elif [[ -d .hg ]]; then SCM=$HG
elif [[ -d .svn ]]; then SCM=$SVN elif [[ -d .svn ]]; then SCM=$SVN
else SCM='NONE' else SCM='NONE'