HEX
Server: nginx/1.18.0
System: Linux vps-9dcdb12e 5.15.0-176-generic #186-Ubuntu SMP Fri Mar 13 11:01:42 UTC 2026 x86_64
User: ubuntu (1000)
PHP: 8.1.2-1ubuntu2.24
Disabled: exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,parse_ini_file,show_source
Upload Files
File: //lib/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
}

exit_code_trustable () {
	true
}