diff options
| author | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 01:44:47 +0300 |
|---|---|---|
| committer | Dominik Ritter <dritter03@googlemail.com> | 2018-06-07 01:44:47 +0300 |
| commit | e763fa14b0f7117071072d4ed174cb639e76526a (patch) | |
| tree | a214b281fe1f96cb85a1a724143ddd0504c80dc4 /test | |
| parent | 4c2f58bdbdaee400b076f2dd56aa5fea2bf9e309 (diff) | |
| parent | 5657fe6ac7d75cac48a386f55e429b716f8d7623 (diff) | |
Merge remote-tracking branch 'chhschou/master' into staging_065
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/segments/rust_version.spec | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/segments/rust_version.spec b/test/segments/rust_version.spec index a9668671..eb1db35e 100755 --- a/test/segments/rust_version.spec +++ b/test/segments/rust_version.spec @@ -19,7 +19,8 @@ function testRust() { alias rustc=mockRust POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(rust_version) - assertEquals "%K{208} %F{black}Rust 0.4.1a-alpha %k%F{darkorange}%f " "$(build_left_prompt)" + assertEquals "%K{208} %F{black%}Rust%f %F{black}0.4.1a-alpha %k%F{darkorange}%f " "$(build_left_prompt)" + unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS unalias rustc |