HEX
Server: LiteSpeed
System: Linux server456.bertina.biz 3.10.0-962.3.2.lve1.5.87.el7.x86_64 #1 SMP Tue Jan 28 09:38:56 UTC 2025 x86_64
User: danahold (1044)
PHP: 7.4.33
Disabled: mail, show_source, system, shell_exec, passthru, exec, popen, proc_open
Upload Files
File: //usr/libexec/git-core/mergetools/meld
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if test -z "${meld_has_output_option:+set}"
	then
		check_meld_for_output_version
	fi
	touch "$BACKUP"
	if test "$meld_has_output_option" = true
	then
		"$merge_tool_path" --output "$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
	fi
	check_unchanged
}

# Check whether 'meld --output <file>' is supported
check_meld_for_output_version () {
	meld_path="$(git config mergetool.meld.path)"
	meld_path="${meld_path:-meld}"

	if "$meld_path" --help 2>&1 | grep -e --output >/dev/null
	then
		meld_has_output_option=true
	else
		meld_has_output_option=false
	fi
}