MOON
Server: Apache
System: Linux server30c.hostingraja.org 3.10.0-962.3.2.lve1.5.63.el7.x86_64 #1 SMP Fri Oct 8 12:03:35 UTC 2021 x86_64
User: jibhires (1887)
PHP: 8.1.30
Disabled: show_source, system, shell_exec, passthru, exec, popen, proc_open, allow_url_fopen, symlink, escapeshellcmd, pcntl_exec
Upload Files
File: //usr/libexec/git-core/mergetools/deltawalker
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	# Adding $(pwd)/ in front of $MERGED should not be necessary.
	# However without it, DeltaWalker (at least v1.9.8 on Windows)
	# crashes with a JRE exception.  The DeltaWalker user manual,
	# shows $(pwd)/ whenever the '-merged' options is given.
	# Adding it here seems to work around the problem.
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
	fi >/dev/null 2>&1
}

translate_merge_tool_path() {
	echo DeltaWalker
}