HEX
Server: Apache/2.4.57 (Unix) OpenSSL/1.1.1k
System: Linux tam.zee-supreme-vps.net 4.18.0-513.9.1.el8_9.x86_64 #1 SMP Sat Dec 2 05:23:44 EST 2023 x86_64
User: adltc (1070)
PHP: 7.4.33
Disabled: NONE
Upload Files
File: //usr/libexec/git-core/mergetools/winmerge
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)"
}