Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 26 insertions, 0 deletions

diff --git a/mergetools/diffmerge b/mergetools/diffmerge
new file mode 100644
index 0000000..9b5b62d
--- /dev/null
+++ b/mergetools/diffmerge
@@ -0,0 +1,26 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
+}
+
+diff_cmd_help () {
+	echo "Use DiffMerge (requires a graphical session)"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" --merge --result="$MERGED" \
+			"$LOCAL" "$BASE" "$REMOTE"
+	else
+		"$merge_tool_path" --merge \
+			--result="$MERGED" "$LOCAL" "$REMOTE"
+	fi
+}
+
+merge_cmd_help () {
+	echo "Use DiffMerge (requires a graphical session)"
+}
+
+exit_code_trustable () {
+	true
+}