HEX
Server: Apache/2.4
System: Linux php-v380.wc2.phx1.stabletransit.com 5.10.0-41-amd64 #1 SMP Debian 5.10.251-3 (2026-04-30) x86_64
User: oasisfloral (2219914)
PHP: 7.4.33
Disabled: leak,posix_getpwuid,posix_getpwnam,posix_getgrid,posix_getgrnam,posix_getgroups
Upload Files
File: //lib/git-core/mergetools/tkdiff
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}

exit_code_trustable () {
	true
}