HEX
Server: LiteSpeed
System: Linux cpir1.prohostdns.com 4.18.0-553.123.2.lve.el8.x86_64 #1 SMP Thu May 7 23:17:13 UTC 2026 x86_64
User: pelakir (2976)
PHP: 8.2.31
Disabled: exec, shell_exec, system, passthru, proc_open, proc_close, proc_terminate, proc_get_status, popen, pclose, pcntl_exec
Upload Files
File: //proc/thread-self/root/usr/libexec/git-core/mergetools/diffuse
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | cat
	fi
}

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