HEX
Server: Apache
System: Linux cpanel91.fastsecurehost.com 3.10.0-962.3.2.lve1.5.87.el7.x86_64 #1 SMP Tue Jan 28 09:38:56 UTC 2025 x86_64
User: harmonyg (1050)
PHP: 8.2.29
Disabled: shell, shell_exec, exec, ini_alter, dl, show_source, passthru, system, eval, pfsockopen, leak, apache_child_terminate, posix_kill, posix_mkfifo, posix_setpgid, posix_setsid, posix_setuid
Upload Files
File: //usr/libexec/git-core/mergetools/ecmerge
diff_cmd () {
	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
			--default --mode=merge3 --to="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			--default --mode=merge2 --to="$MERGED"
	fi
	check_unchanged
}