diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-07-04 11:54:44 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-07-04 11:54:44 -0600 |
| commit | 59344b5c59b7190ad3b14a2e8e02db8b5559141b (patch) | |
| tree | a8e7ede89d3b896967d7d18d071107bd06c77897 /lib/theme-and-appearance.zsh | |
| parent | a3be2e4084285d7625e63bfe4b951c58143e3c9c (diff) | |
| parent | a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b (diff) | |
| download | zsh-59344b5c59b7190ad3b14a2e8e02db8b5559141b.tar.gz zsh-59344b5c59b7190ad3b14a2e8e02db8b5559141b.tar.bz2 zsh-59344b5c59b7190ad3b14a2e8e02db8b5559141b.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'lib/theme-and-appearance.zsh')
| -rw-r--r-- | lib/theme-and-appearance.zsh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 5016d86ca..5c1b6db12 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -39,6 +39,11 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then fi fi +# enable diff color if possible. +if diff --color . . &>/dev/null; then + alias diff='diff --color' +fi + setopt auto_cd setopt multios setopt prompt_subst |