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, 23 insertions, 0 deletions

diff --git a/mergetools/winmerge b/mergetools/winmerge
new file mode 100644
index 0000000..36c72dd
--- /dev/null
+++ b/mergetools/winmerge
@@ -0,0 +1,23 @@
+diff_cmd () {
+	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
+	return 0
+}
+
+diff_cmd_help () {
+	echo "Use WinMerge (requires a graphical session)"
+}
+
+merge_cmd () {
+	# mergetool.winmerge.trustExitCode is implicitly false.
+	# touch $BACKUP so that we can check_unchanged.
+	"$merge_tool_path" -u -e -dl Local -dr Remote \
+		"$LOCAL" "$REMOTE" "$MERGED"
+}
+
+translate_merge_tool_path() {
+	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
+}
+
+merge_cmd_help () {
+	echo "Use WinMerge (requires a graphical session)"
+}