linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-10 04:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/check_for_upgrade.sh
View file

@ -26,9 +26,12 @@ fi
# oh-my-zsh directory.
[[ -w "$ZSH" ]] || return 0
<<<<<<< HEAD
# Cancel upgrade if git is unavailable on the system
whence git >/dev/null || return 0
=======
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
if [ -f ~/.zsh-update ]
then
. ~/.zsh-update
@ -57,3 +60,7 @@ else
# create the zsh file
_update_zsh_update
fi
<<<<<<< HEAD
=======
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c