[PATCH v2 4/5] Make sure to use Araxis' "compare" and not e.g. ImageMagick's
From: Sebastian Schuberth <hidden>
Date: 2016-06-15 22:54:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Sebastian Schuberth <redacted> --- 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