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

(limited to 'mergetools/kompare')

diff --git a/mergetools/kompare b/mergetools/kompare
new file mode 100644
index 0000000..4ce23db
--- /dev/null
+++ b/mergetools/kompare
@@ -0,0 +1,19 @@
+can_merge () {
+	return 1
+}
+
+diff_cmd_help () {
+	echo "Use Kompare (requires a graphical session)"
+}
+
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd_help () {
+	echo "Use Kompare (requires a graphical session)"
+}
+
+exit_code_trustable () {
+	true
+}
-- 
cgit v1.2.3