From 87bcbe7fe12557a65e875cd906d54da52361793a Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 22 Apr 2015 18:18:17 +0200
Subject: [PATCH] rename diff to sdiff in common aliases

because diff is already a common command!

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 7ee2123c1..3c733d3c2 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -72,7 +72,7 @@ alias saguagu="sudo apt-get update && sudo apt-get upgrade"
 # Use Git’s colored diff when available
 hash git &>/dev/null
 if [ $? -eq 0 ]; then
-    function diff() {
+    function sdiff() {
         git diff --no-index --color-words "$@"
     }
 fi