You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
480 B
24 lines
480 B
13 years ago
|
#
|
||
|
|
# Highlights diff output.
|
||
|
|
#
|
||
|
|
# Authors:
|
||
|
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||
|
|
#
|
||
|
|
|
||
|
|
if zstyle -t ':omz:module:utility:diff' color; then
|
||
|
|
function diff {
|
||
|
|
if (( $+commands[colordiff] )); then
|
||
|
|
"$commands[diff]" --unified "$@" | colordiff --difftype diffu
|
||
|
|
elif (( $+commands[git] )); then
|
||
|
|
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
|
||
|
|
else
|
||
|
|
"$commands[diff]" --unified "$@"
|
||
|
|
fi
|
||
|
|
}
|
||
|
|
else
|
||
|
|
unfunction diff
|
||
|
|
fi
|
||
|
|
|
||
|
|
diff --unified "$@"
|
||
|
|
|