HEX

Server: LiteSpeed

System: Linux srv271.doctorhoster.com 4.18.0-553.141.2.lve.el8.x86_64 #1 SMP Wed Jul 8 16:10:02 UTC 2026 x86_64

User: lcipakco (2751)

PHP: 8.3.32

Disabled: show_source, system, shell_exec, passthru, exec, popen, mysql_list_dbs, ini_alter, dl, symlink, link, chgrp, leak, escapeshellcmd, apache_child_terminate, virtual, mb_send_mail, mail, eval, phpinfo

Upload Files

File: //usr/libexec/git-core/mergetools/opendiff

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

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

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

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