summaryrefslogtreecommitdiffstats
path: root/mergetools/araxis
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/araxis')
-rw-r--r--mergetools/araxis26
1 files changed, 26 insertions, 0 deletions
diff --git a/mergetools/araxis b/mergetools/araxis
new file mode 100644
index 0000000..eb32a7d
--- /dev/null
+++ b/mergetools/araxis
@@ -0,0 +1,26 @@
+diff_cmd () {
+ "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
+}
+
+diff_cmd_help () {
+ echo "Use Araxis Merge (requires a graphical session)"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" -wait -merge -3 -a1 \
+ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
+ else
+ "$merge_tool_path" -wait -2 \
+ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
+ fi
+}
+
+merge_cmd_help () {
+ echo "Use Araxis Merge (requires a graphical session)"
+}
+
+translate_merge_tool_path() {
+ echo compare
+}