From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Mon, 23 Jul 2012 07:19:53 GMT
Subject: [PATCH v2 4/5] Make sure to use Araxis' "compare" and not e.g. ImageMagick's
Message-ID: <500CFB19.6010905@gmail.com>
In-Reply-To: <500CF9D2.30102@gmail.com>

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 mergetools/araxis | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..aeba1b9 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,11 @@ merge_cmd () {
 }
 
 translate_merge_tool_path() {
-	echo compare
+	# Make sure to use Araxis' "compare" and not e.g. ImageMagick's.
+	if ls "$(dirname "$(which compare)")"/Araxis* >/dev/null 2>&1
+	then
+		echo compare
+	else
+		echo "$1"
+	fi
 }
-- 
1.7.11.msysgit.2