One Hat Cyber Team

Your IP: 216.73.216.212
Server IP: 13.127.59.50
Server: Linux ip-172-31-46-210 5.15.0-1033-aws #37~20.04.1-Ubuntu SMP Fri Mar 17 11:39:30 UTC 2023 x86_64
Server Software: Apache/2.4.41 (Ubuntu)
PHP Version: 7.4.3-4ubuntu2.29
Buat File | Buat Folder

View File Name : 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
}