From a7e3b72debc7195286f63e77265d14e921fb9797 Mon Sep 17 00:00:00 2001
From: bdargan <brett.dargan@gmail.com>
Date: Mon, 1 Sep 2014 12:56:34 +1000
Subject: [PATCH] fix gdiff obscuring normal diff

---
 _functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_functions b/_functions
index 6cbf78c33ca..9673efe8135 100644
--- a/_functions
+++ b/_functions
@@ -6,7 +6,7 @@ function md() {
 # Use Git’s colored diff when available
 hash git &>/dev/null
 if [ $? -eq 0 ]; then
-	function diff() {
+	function gdiff() {
 		git diff --no-index --color-words "$@"
 	}
 fi