diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2020-07-25 21:01:02 -0600 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-07-25 21:01:02 -0600 |
commit | 1edd2c43b12f9f2c2ef04cfa0428db0f7fc0aa7c (patch) | |
tree | e6aeb9029206948167619f4dc1c2ec42c4040ab4 /lib/theme-and-appearance.zsh | |
parent | 59344b5c59b7190ad3b14a2e8e02db8b5559141b (diff) | |
parent | 95218372402afc9aeafc89c0984310387ce79599 (diff) | |
download | zsh-1edd2c43b12f9f2c2ef04cfa0428db0f7fc0aa7c.tar.gz zsh-1edd2c43b12f9f2c2ef04cfa0428db0f7fc0aa7c.tar.bz2 zsh-1edd2c43b12f9f2c2ef04cfa0428db0f7fc0aa7c.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 5c1b6db12..0b71de372 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 diff --color . . &>/dev/null; then +if command diff --color . . &>/dev/null; then alias diff='diff --color' fi |