d0d01c0bbf32ffe1dc22a66620ca85669c77e6b8
- Author
- Marc Cornellà <marc.cornella@live.com>
- Committer
- Marc Cornellà <marc.cornella@live.com>
- Date
Message
lib: prefix diff call with command to bypass diff aliases
See https://github.com/ohmyzsh/ohmyzsh/pull/8807#issuecomment-652697704
Diff
1diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
2index 5c1b6db124f62a8a878dcbbf8e66ffd6e59be78d..0b71de3726f1644a25652943800ef2c23d960650 100644
3--- a/lib/theme-and-appearance.zsh
4+++ b/lib/theme-and-appearance.zsh
5@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
6 fi
7
8 # enable diff color if possible.
9-if diff --color . . &>/dev/null; then
10+if command diff --color . . &>/dev/null; then
11 alias diff='diff --color'
12 fi
13