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

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

1 files changed, 34 insertions, 0 deletions

diff --git a/mergetools/emerge b/mergetools/emerge
new file mode 100644
index 0000000..fc6892c
--- /dev/null
+++ b/mergetools/emerge
@@ -0,0 +1,34 @@
+diff_cmd () {
+	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
+}
+
+diff_cmd_help () {
+	echo "Use Emacs' Emerge"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" \
+			-f emerge-files-with-ancestor-command \
+			"$LOCAL" "$REMOTE" "$BASE" \
+			"$(basename "$MERGED")"
+	else
+		"$merge_tool_path" \
+			-f emerge-files-command \
+			"$LOCAL" "$REMOTE" \
+			"$(basename "$MERGED")"
+	fi
+}
+
+merge_cmd_help () {
+	echo "Use Emacs' Emerge"
+}
+
+translate_merge_tool_path() {
+	echo emacs
+}
+
+exit_code_trustable () {
+	true
+}