Signed-off-by: Sebastian Schuberth <sschuberth@xxxxxxxxx>
---
mergetools/araxis | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..f8899f8 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,12 @@ merge_cmd () {
}
translate_merge_tool_path() {
- echo compare
+ # Only accept "compare" in a path that contains "araxis" to not
+ # accidently use e.g. ImageMagick's "compare".
+ if type compare | grep -i araxis >/dev/null 2>&1
+ then
+ echo compare
+ else
+ echo "$1"
+ fi
}
--
1.7.11.msysgit.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html