From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 16:47:53 +0200
Subject: Adding upstream version 1:2.39.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 mergetools/ecmerge | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 mergetools/ecmerge

(limited to 'mergetools/ecmerge')

diff --git a/mergetools/ecmerge b/mergetools/ecmerge
new file mode 100644
index 0000000..0d4d609
--- /dev/null
+++ b/mergetools/ecmerge
@@ -0,0 +1,22 @@
+diff_cmd () {
+	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
+}
+
+diff_cmd_help () {
+	echo "Use ECMerge (requires a graphical session)"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
+			--default --mode=merge3 --to="$MERGED"
+	else
+		"$merge_tool_path" "$LOCAL" "$REMOTE" \
+			--default --mode=merge2 --to="$MERGED"
+	fi
+}
+
+merge_cmd_help () {
+	echo "Use ECMerge (requires a graphical session)"
+}
-- 
cgit v1.2.3