From 5ec6074f0633939fd17d94111d10c6c6b062978c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 27 Apr 2024 11:49:36 +0200
Subject: Adding upstream version 1:2.30.2.

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

(limited to 'mergetools/tkdiff')

diff --git a/mergetools/tkdiff b/mergetools/tkdiff
new file mode 100644
index 0000000..eee5cb5
--- /dev/null
+++ b/mergetools/tkdiff
@@ -0,0 +1,16 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
+	else
+		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+	fi
+}
+
+exit_code_trustable () {
+	true
+}
-- 
cgit v1.2.3