linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-27 03:14:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an artifact from merge and some bugs in agnoster theme

Browse source 
For some reason i forgot to save the file in my editor, leading to the code not working. Luckily i looked through the changed files on github again and i found this. This is what happens if you don't care to actually test your code for once
Due to some more lack of testing i totall missed that my earlier fix did not work. This is now really fixed. (i should not write code when tired.)
This commit is contained in:
Kilobyte22 2015-07-27 23:26:49 +02:00
commit 9aa9c66488
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
themes/agnoster.zsh-theme
View file

@ -189,13 +189,8 @@ prompt_hg() {
if `hg st | grep -q "^\?"`; then if `hg st | grep -q "^\?"`; then
prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG" prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
st='±' st='±'
<<<<<<< HEAD
elif `hg st | grep -q "^(M|A)"`; then
prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
=======
elif `hg st | grep -q "^[MA]"`; then elif `hg st | grep -q "^[MA]"`; then
prompt_segment yellow black prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
>>>>>>> a207a38d634cc10441636bc4359cd8a18c502dea
st='±' st='±'
else else
prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG" prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"