XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Bash-it/bash-it into Bash-it-master

pull/1931/head
matchi 2021-09-19 22:35:53 +02:00
parent 3286b4bbcd 77e9404c7d
commit a21e029619
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
themes/base.theme.bash
View File

@ -86,6 +86,7 @@ RBENV_THEME_PROMPT_SUFFIX='|'
RBFU_THEME_PROMPT_PREFIX=' |' RBFU_THEME_PROMPT_PREFIX=' |'
RBFU_THEME_PROMPT_SUFFIX='|' RBFU_THEME_PROMPT_SUFFIX='|'
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
GIT_EXE=$(command -v git 2> /dev/null || true) GIT_EXE=$(command -v git 2> /dev/null || true)
P4_EXE=$(command -v p4 2> /dev/null || true) P4_EXE=$(command -v p4 2> /dev/null || true)
@ -99,6 +100,8 @@ if [[ -x "$SVN_EXE" ]]; then
# Unset the SVN exe variable so that SVN commands are avoided. # Unset the SVN exe variable so that SVN commands are avoided.
SVN_EXE="" SVN_EXE=""
======= =======
=======
>>>>>>> 77e9404c7dafb5c29e887e5c71332cb161014e82
: "${GIT_EXE:=$SCM_GIT}" : "${GIT_EXE:=$SCM_GIT}"
: "${P4_EXE:=$SCM_P4}" : "${P4_EXE:=$SCM_P4}"
: "${HG_EXE:=$SCM_HG}" : "${HG_EXE:=$SCM_HG}"
@ -117,6 +120,9 @@ function _bash_it_appearance_scm_init() {
# Unset the SVN exe variable so that SVN commands are avoided. # Unset the SVN exe variable so that SVN commands are avoided.
SVN_EXE="" SVN_EXE=""
fi fi
<<<<<<< HEAD
>>>>>>> 77e9404c7dafb5c29e887e5c71332cb161014e82
=======
>>>>>>> 77e9404c7dafb5c29e887e5c71332cb161014e82 >>>>>>> 77e9404c7dafb5c29e887e5c71332cb161014e82
fi fi
} }