PHP 8.1.33
Preview: deltawalker Size: 818 B
//usr/libexec/git-core/mergetools/deltawalker

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

diff_cmd_help () {
	echo "Use DeltaWalker (requires a graphical session)"
}

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
}

merge_cmd_help () {
	echo "Use DeltaWalker (requires a graphical session)"
}

translate_merge_tool_path () {
	echo DeltaWalker
}

exit_code_trustable () {
	true
}

Directory Contents

Dirs: 0 × Files: 22

Name Size Perms Modified Actions
515 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
584 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
510 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
818 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
460 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
395 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
453 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
535 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
493 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
432 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
29 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
818 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
264 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
2.16 KB lrw-r--r-- 2025-06-13 22:14:31
Edit Download
29 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
418 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
423 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
403 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
761 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
17.09 KB lrw-r--r-- 2025-06-13 22:14:31
Edit Download
510 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
913 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download

If ZipArchive is unavailable, a .tar will be created (no compression).