summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2020-07-06 17:17:40 +0200
committerMarc Cornellà <marc.cornella@live.com>2020-07-06 17:17:40 +0200
commitd0d01c0bbf32ffe1dc22a66620ca85669c77e6b8 (patch)
tree49a91067e069ba9bf0f7f3e194baf0781493acb0 /lib
parentfd9781b4c7036a3ef0a62744b9ecae327f9f2f24 (diff)
downloadzsh-d0d01c0bbf32ffe1dc22a66620ca85669c77e6b8.tar.gz
zsh-d0d01c0bbf32ffe1dc22a66620ca85669c77e6b8.tar.bz2
zsh-d0d01c0bbf32ffe1dc22a66620ca85669c77e6b8.zip
lib: prefix diff call with command to bypass diff aliases
See https://github.com/ohmyzsh/ohmyzsh/pull/8807#issuecomment-652697704
Diffstat (limited to 'lib')
-rw-r--r--lib/theme-and-appearance.zsh2
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