diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2021-10-23 18:01:40 -0600 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-10-23 18:01:40 -0600 |
commit | fad92c603be0ff36825cc53bf8c485d4b95c7869 (patch) | |
tree | 407fe826be62a3543b6feab4f3552f58575234de /lib/theme-and-appearance.zsh | |
parent | c674485e6b4abe313469900997d893d2940ee843 (diff) | |
parent | f1dd97bb2a9df55fae9b1ca26c829b9f8b290667 (diff) | |
download | zsh-fad92c603be0ff36825cc53bf8c485d4b95c7869.tar.gz zsh-fad92c603be0ff36825cc53bf8c485d4b95c7869.tar.bz2 zsh-fad92c603be0ff36825cc53bf8c485d4b95c7869.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'lib/theme-and-appearance.zsh')
-rw-r--r-- | lib/theme-and-appearance.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 0b71de372..00947f72d 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then fi # enable diff color if possible. -if command diff --color . . &>/dev/null; then +if command diff --color /dev/null /dev/null &>/dev/null; then alias diff='diff --color' fi |