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/guiffy | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 mergetools/guiffy

(limited to 'mergetools/guiffy')

diff --git a/mergetools/guiffy b/mergetools/guiffy
new file mode 100644
index 0000000..3ed07ef
--- /dev/null
+++ b/mergetools/guiffy
@@ -0,0 +1,26 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+diff_cmd_help () {
+	echo "Use Guiffy's Diff Tool (requires a graphical session)"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" -s "$LOCAL" \
+		"$REMOTE" "$BASE" "$MERGED"
+	else
+		"$merge_tool_path" -m "$LOCAL" \
+		"$REMOTE" "$MERGED"
+	fi
+}
+
+merge_cmd_help () {
+	echo "Use Guiffy's Diff Tool (requires a graphical session)"
+}
+
+exit_code_trustable () {
+	true
+}
-- 
cgit v1.2.3