HEX
Server: LiteSpeed
System: Linux standart12.isimtescil.net 4.18.0-553.121.1.lve.el8.x86_64 #1 SMP Thu Apr 30 16:40:41 UTC 2026 x86_64
User: mvqmakin (1201)
PHP: 8.1.34
Disabled: dl,exec,shell_exec,system,passthru,popen,pclose,proc_open,mail,proc_nice,proc_terminate,proc_get_status,proc_close,leak,apache_child_terminate,posix_kill,posix_mkfifo,posix_setpgid,posix_setsid,posix_setuid,escapeshellcmd,escapeshellarg,shell-exec,crack_check,crack_closedict,crack_getlastmessage,crack_opendict,symlink,ini_restore,posix_getpwuid,ini_sefind,grep,sh2_exec,diskfreespace,disk_free_space,disk_total_space,highlight_file,link,lchgrp,lchown,show_source,sendmail
Upload Files
File: //usr/libexec/git-core/mergetools/kdiff3
diff_cmd () {
	"$merge_tool_path" \
		--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
		"$LOCAL" "$REMOTE" >/dev/null 2>&1
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Base)" \
			--L2 "$MERGED (Local)" \
			--L3 "$MERGED (Remote)" \
			-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	else
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Local)" \
			--L2 "$MERGED (Remote)" \
			-o "$MERGED" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	fi
}

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

exit_code_trustable () {
	true
}

translate_merge_tool_path() {
	if type kdiff3 >/dev/null 2>/dev/null
	then
		echo kdiff3
	else
		mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
	fi
}